Removes --enable-stacked-tab-strip flag (Stacked Tabs)

chrome/browser/ui/browser_view_prefs.cc

Index: chrome/browser/ui/browser_view_prefs.cc
diff --git a/chrome/browser/ui/browser_view_prefs.cc b/chrome/browser/ui/browser_view_prefs.cc
index 65b2181c1842b91c5c4b921074eee2d6a0bf5111..f3257440f04e24567e5aff0f1147eb992645e534 100644
--- a/chrome/browser/ui/browser_view_prefs.cc
+++ b/chrome/browser/ui/browser_view_prefs.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/browser_view_prefs.h"
 
 #include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
@@ -20,6 +21,11 @@ const int kDefaultPluginMessageResponseTimeout = 25000;
 // How frequently we check for hung plugin windows.
 const int kDefaultHungPluginDetectFrequency = 2000;
 
+// DEPRECATED: this is replaced by kTabStripStackedLayout and exists for
+// backwards compatibility.
+// Old values: 0 = SHRINK (default),  1 = STACKED

[Peter Kasting, 2014/05/28 19:13:06]

Nit: Extra space

[varkha, 2014/05/28 22:15:56]

Done.

+const char kTabStripLayoutType[] = "tab_strip_layout_type";
+
 }  // namespace
 
 namespace chrome {
@@ -29,6 +35,8 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) {
                                 kDefaultPluginMessageResponseTimeout);
   registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
                                 kDefaultHungPluginDetectFrequency);
+  registry->RegisterIntegerPref(kTabStripLayoutType, 0);
+  registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false);
 }
 
 void RegisterBrowserViewProfilePrefs(
@@ -44,4 +52,12 @@ void RegisterBrowserViewProfilePrefs(
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
+void MigrateBrowserTabStripPrefs(PrefService* prefs) {
+  if (prefs->HasPrefPath(kTabStripLayoutType)) {
+    prefs->SetBoolean(prefs::kTabStripStackedLayout,
+                      prefs->GetInteger(kTabStripLayoutType) != 0);
+    prefs->ClearPref(kTabStripLayoutType);
+  }

[sky, 2014/05/28 19:45:56]

Do you need to schedule a save here?

[varkha, 2014/05/28 22:15:56]

I looked at similar methods and none of them have that. Do you think this is
missing in all of them or in some other place? Do we really need to explicitly
sync something like this?

[sky, 2014/05/28 23:12:30]

It's probably that the prefs code has changes since I remember it. If you don't
need to explicitly tell prefs store its dirty, great!

+}
+
 }  // namespace chrome