| 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..175b0c72cc956cf24317360d661efb34190f1102 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.
|
| +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);
|
| + }
|
| +}
|
| +
|
| } // namespace chrome
|
|
|