| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.chrome.browser; | 5 package org.chromium.chrome.browser; |
| 6 | 6 |
| 7 import android.content.Context; | 7 import android.content.Context; |
| 8 import android.os.Build; | 8 import android.os.Build; |
| 9 | 9 |
| 10 import org.chromium.base.CalledByNative; | 10 import org.chromium.base.CalledByNative; |
| 11 import org.chromium.base.ThreadUtils; | 11 import org.chromium.base.ThreadUtils; |
| 12 import org.chromium.base.library_loader.LibraryProcessType;; |
| 12 import org.chromium.base.library_loader.ProcessInitException; | 13 import org.chromium.base.library_loader.ProcessInitException; |
| 13 import org.chromium.chrome.browser.preferences.LocationSettings; | 14 import org.chromium.chrome.browser.preferences.LocationSettings; |
| 14 import org.chromium.chrome.browser.preferences.PreferencesLauncher; | 15 import org.chromium.chrome.browser.preferences.PreferencesLauncher; |
| 15 import org.chromium.chrome.browser.preferences.ProtectedContentPreferences; | 16 import org.chromium.chrome.browser.preferences.ProtectedContentPreferences; |
| 16 import org.chromium.chrome.browser.preferences.autofill.AutofillPreferences; | 17 import org.chromium.chrome.browser.preferences.autofill.AutofillPreferences; |
| 17 import org.chromium.chrome.browser.preferences.password.ManageSavedPasswordsPref
erences; | 18 import org.chromium.chrome.browser.preferences.password.ManageSavedPasswordsPref
erences; |
| 18 import org.chromium.content.app.ContentApplication; | 19 import org.chromium.content.app.ContentApplication; |
| 19 import org.chromium.content.browser.BrowserStartupController; | 20 import org.chromium.content.browser.BrowserStartupController; |
| 20 | 21 |
| 21 /** | 22 /** |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 * | 65 * |
| 65 * Note that this can only be called on the UI thread. | 66 * Note that this can only be called on the UI thread. |
| 66 * | 67 * |
| 67 * @param callback the callback to be called when browser startup is complet
e. | 68 * @param callback the callback to be called when browser startup is complet
e. |
| 68 * @throws ProcessInitException | 69 * @throws ProcessInitException |
| 69 */ | 70 */ |
| 70 public void startChromeBrowserProcessesAsync(BrowserStartupController.Startu
pCallback callback) | 71 public void startChromeBrowserProcessesAsync(BrowserStartupController.Startu
pCallback callback) |
| 71 throws ProcessInitException { | 72 throws ProcessInitException { |
| 72 assert ThreadUtils.runningOnUiThread() : "Tried to start the browser on
the wrong thread"; | 73 assert ThreadUtils.runningOnUiThread() : "Tried to start the browser on
the wrong thread"; |
| 73 Context applicationContext = getApplicationContext(); | 74 Context applicationContext = getApplicationContext(); |
| 74 BrowserStartupController.get(applicationContext).startBrowserProcessesAs
ync(callback); | 75 BrowserStartupController.get(applicationContext, LibraryProcessType.PROC
ESS_BROWSER) |
| 76 .startBrowserProcessesAsync(callback); |
| 75 } | 77 } |
| 76 | 78 |
| 77 /** | 79 /** |
| 78 * Returns an instance of LocationSettings to be installed as a singleton. | 80 * Returns an instance of LocationSettings to be installed as a singleton. |
| 79 */ | 81 */ |
| 80 public LocationSettings createLocationSettings() { | 82 public LocationSettings createLocationSettings() { |
| 81 return new LocationSettings(this); | 83 return new LocationSettings(this); |
| 82 } | 84 } |
| 83 | 85 |
| 84 /** | 86 /** |
| (...skipping 16 matching lines...) Expand all Loading... |
| 101 | 103 |
| 102 /** | 104 /** |
| 103 * @return The user agent string of Chrome. | 105 * @return The user agent string of Chrome. |
| 104 */ | 106 */ |
| 105 public static String getBrowserUserAgent() { | 107 public static String getBrowserUserAgent() { |
| 106 return nativeGetBrowserUserAgent(); | 108 return nativeGetBrowserUserAgent(); |
| 107 } | 109 } |
| 108 | 110 |
| 109 private static native String nativeGetBrowserUserAgent(); | 111 private static native String nativeGetBrowserUserAgent(); |
| 110 } | 112 } |
| OLD | NEW |