Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1320)

Unified Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 1496953003: [Enhanced Bookmarks] Make enhanced bookmarks default for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase & ios update Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | components/enhanced_bookmarks.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/bookmarks/bookmarks_bridge.cc
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 9dc90c0641d101f3cfc43209defc579b91edb7b3..72f5138205f520e8a514e4d3ba96b40c59b53ecf 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -26,7 +26,6 @@
#include "components/bookmarks/common/android/bookmark_type.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/bookmarks/managed/managed_bookmark_service.h"
-#include "components/enhanced_bookmarks/enhanced_bookmark_features.h"
#include "components/query_parser/query_parser.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/undo/bookmark_undo_service.h"
@@ -144,12 +143,6 @@ static jlong Init(JNIEnv* env,
return reinterpret_cast<intptr_t>(delegate);
}
-static jboolean IsEnhancedBookmarksFeatureEnabled(
- JNIEnv* env,
- const JavaParamRef<jclass>& clazz) {
- return enhanced_bookmarks::IsEnhancedBookmarksEnabled();
-}
-
jboolean BookmarksBridge::IsEditBookmarksEnabled(
JNIEnv* env,
const JavaParamRef<jobject>& obj) {
@@ -796,8 +789,7 @@ base::string16 BookmarksBridge::GetTitle(const BookmarkNode* node) const {
if (partner_bookmarks_shim_->IsPartnerBookmark(node))
return partner_bookmarks_shim_->GetTitle(node);
- if (node == bookmark_model_->bookmark_bar_node()
- && enhanced_bookmarks::IsEnhancedBookmarksEnabled()) {
+ if (node == bookmark_model_->bookmark_bar_node()) {
return l10n_util::GetStringUTF16(IDS_ENHANCED_BOOKMARK_BAR_FOLDER_NAME);
}
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | components/enhanced_bookmarks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698