[Enhanced Bookmarks] Make enhanced bookmarks default for Android.

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

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 1e4f198bf299420c8029c4745ae00ed35c324092..d2494698703ee3ccf572dc4d1cbd34aec6d40469 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -63,7 +63,6 @@ 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.bookmark.ManageBookmarkActivity;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
@@ -1047,37 +1046,23 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         // TODO(bauerb): This does not take partner bookmarks into account.
         final long bookmarkId = tabToBookmark.getUserBookmarkId();
 
-        if (EnhancedBookmarkUtils.isEnhancedBookmarkEnabled()) {
-            final EnhancedBookmarksModel bookmarkModel = new EnhancedBookmarksModel();
-            if (bookmarkModel.isBookmarkModelLoaded()) {
-                EnhancedBookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,
-                        tabToBookmark, getSnackbarManager(), ChromeActivity.this);
-            } else if (mBookmarkObserver == null) {
-                mBookmarkObserver = new BookmarkModelObserver() {
-                    @Override
-                    public void bookmarkModelChanged() {}
+        final EnhancedBookmarksModel bookmarkModel = new EnhancedBookmarksModel();
+        if (bookmarkModel.isBookmarkModelLoaded()) {
+            EnhancedBookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,

[Ian Wen, 2015/12/04 04:28:58]

Use runAfterModelLoaded in BookmarksBridge and remove the unnecessary observer
here.

[Kibeom Kim (inactive), 2015/12/04 21:07:52]

Done.

+                    tabToBookmark, getSnackbarManager(), ChromeActivity.this);
+        } else if (mBookmarkObserver == null) {
+            mBookmarkObserver = new BookmarkModelObserver() {
+                @Override
+                public void bookmarkModelChanged() {}
 
-                    @Override
-                    public void bookmarkModelLoaded() {
-                        EnhancedBookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,
-                                tabToBookmark, getSnackbarManager(), ChromeActivity.this);
-                        bookmarkModel.removeObserver(this);
-                    }
-                };
-                bookmarkModel.addObserver(mBookmarkObserver);
-            }
-        } else {
-            Intent intent = new Intent(this, ManageBookmarkActivity.class);
-            if (bookmarkId == ChromeBrowserProviderClient.INVALID_BOOKMARK_ID) {
-                intent.putExtra(ManageBookmarkActivity.BOOKMARK_INTENT_IS_FOLDER, false);
-                intent.putExtra(ManageBookmarkActivity.BOOKMARK_INTENT_TITLE,
-                        tabToBookmark.getTitle());
-                intent.putExtra(ManageBookmarkActivity.BOOKMARK_INTENT_URL, tabToBookmark.getUrl());
-            } else {
-                intent.putExtra(ManageBookmarkActivity.BOOKMARK_INTENT_IS_FOLDER, false);
-                intent.putExtra(ManageBookmarkActivity.BOOKMARK_INTENT_ID, bookmarkId);
-            }
-            startActivity(intent);
+                @Override
+                public void bookmarkModelLoaded() {
+                    EnhancedBookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,
+                            tabToBookmark, getSnackbarManager(), ChromeActivity.this);
+                    bookmarkModel.removeObserver(this);
+                }
+            };
+            bookmarkModel.addObserver(mBookmarkObserver);
         }
     }