Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / bookmarks / enhanced_bookmarks_features.cc

diff --git a/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc b/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
index f441a62..45cf0d4 100644 (file)
--- a/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
+++ b/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
@@ -21,6 +21,7 @@
 #include "components/variations/variations_associated_data.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
+#include "ui/base/device_form_factor.h"
 
 namespace {
 
@@ -89,6 +90,11 @@ void UpdateBookmarksExperimentState(
   // "0" - user opted out.
   bool opt_out = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                      switches::kEnhancedBookmarksExperiment) == "0";
+#if defined(OS_ANDROID)
+  // Tablets automagically do opt out.
+  opt_out =
+      opt_out || ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET;
+#endif  // defined(OS_ANDROID)
 
   BookmarksExperimentState bookmarks_experiment_new_state =
       BOOKMARKS_EXPERIMENT_NONE;