X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fbookmarks%2Fenhanced_bookmarks_features.cc;h=45cf0d46823ea881fa7d1a528ca0ab65ecd3b68b;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=f441a62a398af2461bc8583c0ab1216c6f6f5ffb;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc b/src/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
index f441a62..45cf0d4 100644
--- 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;