Index: chrome/android/java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java |
similarity index 51% |
rename from chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivityBase.java |
rename to chrome/android/java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java |
index 9e2b95e830af49926e3de5982854249ccbb4e72b..f28b13f3b5157cd3bb2a2815e463a6c3431a2f61 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivityBase.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java |
@@ -1,23 +1,26 @@ |
-// Copyright 2015 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-package org.chromium.chrome.browser.bookmarks; |
+package org.chromium.chrome.browser; |
import android.os.Bundle; |
import android.support.v7.app.AppCompatActivity; |
-import android.util.Log; |
+import org.chromium.base.Log; |
import org.chromium.base.library_loader.ProcessInitException; |
-import org.chromium.chrome.browser.ChromeApplication; |
+import org.chromium.chrome.browser.bookmarks.BookmarkActivity; |
import org.chromium.chrome.browser.init.ChromeBrowserInitializer; |
/** |
- * Activity base class that all the bookmark activities inherit. Currently it's responsible |
- * for ensuring native library initialization. |
+ * Ensures that the native library is loaded by synchronously initializing it on creation. |
+ * |
+ * This is needed for Activities that can be started without going through the regular asynchronous |
+ * browser startup pathway, which could happen if the user restarted Chrome after it died in the |
+ * background with the Activity visible. One example is {@link BookmarkActivity} and its kin. |
*/ |
-abstract class BookmarkActivityBase extends AppCompatActivity { |
- private static final String TAG = "BookmarkActivityBase"; |
+public abstract class SynchronousInitializationActivity extends AppCompatActivity { |
+ private static final String TAG = "SyncInitActivity"; |
@Override |
protected void onCreate(Bundle savedInstanceState) { |