OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/browser_view_prefs.h" | 5 #include "chrome/browser/ui/browser_view_prefs.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
9 #include "components/pref_registry/pref_registry_syncable.h" | 9 #include "components/pref_registry/pref_registry_syncable.h" |
10 #include "components/prefs/pref_registry_simple.h" | 10 #include "components/prefs/pref_registry_simple.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 | 25 |
26 namespace chrome { | 26 namespace chrome { |
27 | 27 |
28 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) { | 28 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) { |
29 registry->RegisterIntegerPref(kTabStripLayoutType, 0); | 29 registry->RegisterIntegerPref(kTabStripLayoutType, 0); |
30 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); | 30 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); |
31 } | 31 } |
32 | 32 |
33 void RegisterBrowserViewProfilePrefs( | 33 void RegisterBrowserViewProfilePrefs( |
34 user_prefs::PrefRegistrySyncable* registry) { | 34 user_prefs::PrefRegistrySyncable* registry) { |
35 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 35 #if !defined(OS_CHROMEOS) && defined(USE_X11) |
36 registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, | 36 registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, |
37 ui::GetCustomFramePrefDefault()); | 37 ui::GetCustomFramePrefDefault()); |
38 #endif | 38 #endif |
39 | 39 |
40 registry->RegisterIntegerPref( | 40 registry->RegisterIntegerPref( |
41 prefs::kBackShortcutBubbleShownCount, 0, | 41 prefs::kBackShortcutBubbleShownCount, 0, |
42 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 42 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
43 } | 43 } |
44 | 44 |
45 void MigrateBrowserTabStripPrefs(PrefService* prefs) { | 45 void MigrateBrowserTabStripPrefs(PrefService* prefs) { |
46 if (prefs->HasPrefPath(kTabStripLayoutType)) { | 46 if (prefs->HasPrefPath(kTabStripLayoutType)) { |
47 prefs->SetBoolean(prefs::kTabStripStackedLayout, | 47 prefs->SetBoolean(prefs::kTabStripStackedLayout, |
48 prefs->GetInteger(kTabStripLayoutType) != 0); | 48 prefs->GetInteger(kTabStripLayoutType) != 0); |
49 prefs->ClearPref(kTabStripLayoutType); | 49 prefs->ClearPref(kTabStripLayoutType); |
50 } | 50 } |
51 } | 51 } |
52 | 52 |
53 } // namespace chrome | 53 } // namespace chrome |
OLD | NEW |