| 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 "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/common/pref_names.h" | 9 #include "chrome/common/pref_names.h" |
| 10 #include "components/pref_registry/pref_registry_syncable.h" | 10 #include "components/pref_registry/pref_registry_syncable.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); | 39 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); |
| 40 } | 40 } |
| 41 | 41 |
| 42 void RegisterBrowserViewProfilePrefs( | 42 void RegisterBrowserViewProfilePrefs( |
| 43 user_prefs::PrefRegistrySyncable* registry) { | 43 user_prefs::PrefRegistrySyncable* registry) { |
| 44 bool custom_frame_default = false; | 44 bool custom_frame_default = false; |
| 45 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 45 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 46 custom_frame_default = ui::GetCustomFramePrefDefault(); | 46 custom_frame_default = ui::GetCustomFramePrefDefault(); |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 registry->RegisterBooleanPref( | 49 registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, |
| 50 prefs::kUseCustomChromeFrame, | 50 custom_frame_default); |
| 51 custom_frame_default, | |
| 52 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 53 } | 51 } |
| 54 | 52 |
| 55 void MigrateBrowserTabStripPrefs(PrefService* prefs) { | 53 void MigrateBrowserTabStripPrefs(PrefService* prefs) { |
| 56 if (prefs->HasPrefPath(kTabStripLayoutType)) { | 54 if (prefs->HasPrefPath(kTabStripLayoutType)) { |
| 57 prefs->SetBoolean(prefs::kTabStripStackedLayout, | 55 prefs->SetBoolean(prefs::kTabStripStackedLayout, |
| 58 prefs->GetInteger(kTabStripLayoutType) != 0); | 56 prefs->GetInteger(kTabStripLayoutType) != 0); |
| 59 prefs->ClearPref(kTabStripLayoutType); | 57 prefs->ClearPref(kTabStripLayoutType); |
| 60 } | 58 } |
| 61 } | 59 } |
| 62 | 60 |
| 63 } // namespace chrome | 61 } // namespace chrome |
| OLD | NEW |