projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
public
/
android
/
java
/
src
/
org
/
chromium
/
content
/
browser
/
BrowserStartupController.java
diff --git
a/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
b/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
index
403c906
..
caad20c
100644
(file)
--- a/
src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
+++ b/
src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
@@
-13,10
+13,10
@@
import com.google.common.annotations.VisibleForTesting;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
+import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LoaderErrors;
+import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.app.ContentMain;
import org.chromium.content.app.ContentMain;
-import org.chromium.content.app.LibraryLoader;
-import org.chromium.content.common.ProcessInitException;
-import org.chromium.content.common.ResultCodes;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@@
-37,6
+37,9
@@
import java.util.List;
@JNINamespace("content")
public class BrowserStartupController {
@JNINamespace("content")
public class BrowserStartupController {
+ /**
+ * This provides the interface to the callbacks for successful or failed startup
+ */
public interface StartupCallback {
void onSuccess(boolean alreadyStarted);
void onFailure();
public interface StartupCallback {
void onSuccess(boolean alreadyStarted);
void onFailure();
@@
-196,7
+199,7
@@
public class BrowserStartupController {
// Startup should now be complete
assert mStartupDone;
if (!mStartupSuccess) {
// Startup should now be complete
assert mStartupDone;
if (!mStartupSuccess) {
- throw new ProcessInitException(
ResultCodes.RESULT_CODE
_NATIVE_STARTUP_FAILED);
+ throw new ProcessInitException(
LoaderErrors.LOADER_ERROR
_NATIVE_STARTUP_FAILED);
}
}
}
}