Chromium Code Reviews| Index: content/public/android/java/src/org/chromium/content/app/ContentMain.java |
| diff --git a/content/public/android/java/src/org/chromium/content/app/ContentMain.java b/content/public/android/java/src/org/chromium/content/app/ContentMain.java |
| index 09ba783a1557a776eaf07d1caf6dfb59eb3c17cd..1c53d07fcc7ff80698904c05caccaf8f650163e3 100644 |
| --- a/content/public/android/java/src/org/chromium/content/app/ContentMain.java |
| +++ b/content/public/android/java/src/org/chromium/content/app/ContentMain.java |
| @@ -7,6 +7,7 @@ package org.chromium.content.app; |
| import android.content.Context; |
| import org.chromium.base.JNINamespace; |
| +import org.chromium.content.browser.StartupObserver; |
| /** |
| * This class is used to initialize all types of process. It corresponds to |
| @@ -23,17 +24,17 @@ public class ContentMain { |
| /** |
| * Initialize application context in native side. |
| **/ |
| - public static void initApplicationContext(Context context) { |
| + static public void initApplicationContext(Context context) { |
|
joth
2013/07/22 16:28:15
please revert these 4 keyword transpose edits - it
aberent
2013/07/22 19:37:40
Done. Accidental transposition.
|
| nativeInitApplicationContext(context); |
| } |
| /** |
| * Start the ContentMainRunner in native side. |
|
joth
2013/07/22 16:28:15
document the new params
aberent
2013/07/22 19:37:40
Done.
|
| **/ |
| - public static int start() { |
| - return nativeStart(); |
| + static public int start(boolean mustBeImmediate, StartupObserver observer) { |
| + return nativeStart(mustBeImmediate, observer); |
| } |
| - private static native void nativeInitApplicationContext(Context context); |
| - private static native int nativeStart(); |
| + static private native void nativeInitApplicationContext(Context context); |
| + static private native int nativeStart(boolean mustBeImmediate, StartupObserver observer); |
| }; |