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" |
11 #include "components/prefs/pref_service.h" | 11 #include "components/prefs/pref_service.h" |
12 | 12 |
13 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 13 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
14 #include "ui/base/x/x11_util.h" | 14 #include "ui/base/x/x11_util.h" |
15 #endif | 15 #endif |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 // How long do we wait before we consider a window hung (in ms). | |
20 const int kDefaultPluginMessageResponseTimeout = 25000; | |
21 | |
22 // How frequently we check for hung plugin windows. | |
23 const int kDefaultHungPluginDetectFrequency = 2000; | |
24 | |
25 // DEPRECATED: this is replaced by kTabStripStackedLayout and exists for | 19 // DEPRECATED: this is replaced by kTabStripStackedLayout and exists for |
26 // backwards compatibility. | 20 // backwards compatibility. |
27 // Old values: 0 = SHRINK (default), 1 = STACKED. | 21 // Old values: 0 = SHRINK (default), 1 = STACKED. |
28 const char kTabStripLayoutType[] = "tab_strip_layout_type"; | 22 const char kTabStripLayoutType[] = "tab_strip_layout_type"; |
29 | 23 |
30 } // namespace | 24 } // namespace |
31 | 25 |
32 namespace chrome { | 26 namespace chrome { |
33 | 27 |
34 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) { | 28 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) { |
35 registry->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, | |
36 kDefaultPluginMessageResponseTimeout); | |
37 registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, | |
38 kDefaultHungPluginDetectFrequency); | |
39 registry->RegisterIntegerPref(kTabStripLayoutType, 0); | 29 registry->RegisterIntegerPref(kTabStripLayoutType, 0); |
40 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); | 30 registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false); |
41 } | 31 } |
42 | 32 |
43 void RegisterBrowserViewProfilePrefs( | 33 void RegisterBrowserViewProfilePrefs( |
44 user_prefs::PrefRegistrySyncable* registry) { | 34 user_prefs::PrefRegistrySyncable* registry) { |
45 bool custom_frame_default = false; | 35 bool custom_frame_default = false; |
46 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 36 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
47 custom_frame_default = ui::GetCustomFramePrefDefault(); | 37 custom_frame_default = ui::GetCustomFramePrefDefault(); |
48 #endif | 38 #endif |
49 | 39 |
50 registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, | 40 registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, |
51 custom_frame_default); | 41 custom_frame_default); |
52 } | 42 } |
53 | 43 |
54 void MigrateBrowserTabStripPrefs(PrefService* prefs) { | 44 void MigrateBrowserTabStripPrefs(PrefService* prefs) { |
55 if (prefs->HasPrefPath(kTabStripLayoutType)) { | 45 if (prefs->HasPrefPath(kTabStripLayoutType)) { |
56 prefs->SetBoolean(prefs::kTabStripStackedLayout, | 46 prefs->SetBoolean(prefs::kTabStripStackedLayout, |
57 prefs->GetInteger(kTabStripLayoutType) != 0); | 47 prefs->GetInteger(kTabStripLayoutType) != 0); |
58 prefs->ClearPref(kTabStripLayoutType); | 48 prefs->ClearPref(kTabStripLayoutType); |
59 } | 49 } |
60 } | 50 } |
61 | 51 |
62 } // namespace chrome | 52 } // namespace chrome |
OLD | NEW |