Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4484)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java

Issue 1521013002: Make the ChromeBrowserInitializer the only way to start the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yfriedman@ comment Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
index a7204ea00b0d031b250a8ef992996930004744fa..6cf6d4322690476ef1026321fbff5c63b7624ccd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
@@ -17,6 +17,7 @@ import android.util.Log;
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.browser.sync.SyncController;
import org.chromium.sync.signin.ChromeSigninController;
@@ -43,11 +44,11 @@ public class PassphraseActivity extends FragmentActivity implements
// During a normal user flow the ChromeTabbedActivity would start the Chrome browser
// process and this wouldn't be necessary.
try {
- ((ChromeApplication) getApplication())
- .startBrowserProcessesAndLoadLibrariesSync(true);
+ ChromeBrowserInitializer.getInstance(this).handleSynchronousStartup();
} catch (ProcessInitException e) {
Log.e(TAG, "Failed to start browser process.", e);
ChromeApplication.reportStartupErrorAndExit(e);
+ return;
}
assert ProfileSyncService.get() != null;
getFragmentManager().addOnBackStackChangedListener(this);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698