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

Unified Diff: components/enhanced_bookmarks/enhanced_bookmark_features.cc

Issue 1496953003: [Enhanced Bookmarks] Make enhanced bookmarks default for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: components/enhanced_bookmarks/enhanced_bookmark_features.cc
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_features.cc b/components/enhanced_bookmarks/enhanced_bookmark_features.cc
index 5ca31914ac062d0464f6f965c8cb140c8893be93..113791d173ff3887bf47417f1b6907899c271190 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_features.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_features.cc
@@ -8,24 +8,14 @@
#include "base/command_line.h"
#include "components/enhanced_bookmarks/enhanced_bookmark_switches.h"
-#include "components/offline_pages/offline_page_feature.h"
#include "components/variations/variations_associated_data.h"
-#if defined(OS_IOS) || defined(OS_ANDROID)
-
namespace enhanced_bookmarks {
namespace {
const char kFieldTrialName[] = "EnhancedBookmarks";
} // namespace
bool IsEnhancedBookmarksEnabled() {
-#if defined(OS_ANDROID)
- // If offline pages feature is enabled, also enable enhanced bookmarks feature
- // regardless its state.
- if (offline_pages::IsOfflinePagesEnabled())
- return true;
-#endif
-
// kEnhancedBookmarksExperiment flag could have values "", "1" and "0". "" -
// default, "0" - user opted out, "1" - user opted in. Tests also use the
// command line flag to force enhanced bookmark to be on.
@@ -44,5 +34,3 @@ bool IsEnhancedBookmarksEnabled() {
}
} // namespace enhanced_bookmarks
-
-#endif

Powered by Google App Engine
This is Rietveld 408576698