Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
index ddd8f973e83fa2bb9b21f0c8cfe9c7889cf69618..f6c1edbd46969322b3e55db7dee0a18dc4262fd4 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -60,7 +60,7 @@ import org.chromium.chrome.browser.appmenu.AppMenu; |
import org.chromium.chrome.browser.appmenu.AppMenuHandler; |
import org.chromium.chrome.browser.appmenu.AppMenuObserver; |
import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; |
-import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver; |
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver; |
import org.chromium.chrome.browser.bookmarks.BookmarkModel; |
import org.chromium.chrome.browser.bookmarks.BookmarkUtils; |
import org.chromium.chrome.browser.compositor.CompositorViewHolder; |
@@ -1015,7 +1015,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
} |
// Defense in depth against the UI being erroneously enabled. |
- if (!mToolbarManager.getBookmarksBridge().isEditBookmarksEnabled()) { |
+ if (!mToolbarManager.getBookmarkBridge().isEditBookmarksEnabled()) { |
assert false; |
return; |
} |