Skip to content

Commit

Permalink
WIP - reverted some removed items
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexeyBarabash committed Jun 14, 2020
1 parent e4f8a2a commit d5771d9
Show file tree
Hide file tree
Showing 8 changed files with 3,424 additions and 37 deletions.
10 changes: 5 additions & 5 deletions android/java/org/chromium/chrome/browser/BraveActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.chromium.base.task.TaskTraits;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveHelper;
//import org.chromium.chrome.browser.BraveSyncWorker;
import org.chromium.chrome.browser.BraveSyncWorker;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
Expand Down Expand Up @@ -86,7 +86,7 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
public static final String BRAVE_BLOG_URL = "http://www.brave.com/blog";

// Sync worker
//public BraveSyncWorker mBraveSyncWorker;
public BraveSyncWorker mBraveSyncWorker;

@Override
public void onResumeWithNative() {
Expand Down Expand Up @@ -201,9 +201,9 @@ public void finishNativeInitialization() {
setBgBraveAdsDefaultOff();

Context app = ContextUtils.getApplicationContext();
// if (null != app && (this instanceof ChromeTabbedActivity)) {
// mBraveSyncWorker = new BraveSyncWorker(app);
// }
if (null != app && (this instanceof ChromeTabbedActivity)) {
mBraveSyncWorker = new BraveSyncWorker(app);
}

OnboardingActivity onboardingActivity = null;
for (Activity ref : ApplicationStatus.getRunningActivities()) {
Expand Down
Loading

0 comments on commit d5771d9

Please sign in to comment.