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 "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
9 #include "components/user_prefs/pref_registry_syncable.h" | |
9 | 10 |
10 namespace { | 11 namespace { |
11 | 12 |
12 // How long do we wait before we consider a window hung (in ms). | 13 // How long do we wait before we consider a window hung (in ms). |
13 const int kDefaultPluginMessageResponseTimeout = 25000; | 14 const int kDefaultPluginMessageResponseTimeout = 25000; |
14 | 15 |
15 // How frequently we check for hung plugin windows. | 16 // How frequently we check for hung plugin windows. |
16 const int kDefaultHungPluginDetectFrequency = 2000; | 17 const int kDefaultHungPluginDetectFrequency = 2000; |
17 | 18 |
18 } // namespace | 19 } // namespace |
19 | 20 |
20 namespace chrome { | 21 namespace chrome { |
21 | 22 |
22 void RegisterBrowserViewPrefs(PrefRegistrySimple* registry) { | 23 void RegisterBrowserViewPrefs(PrefRegistrySimple* registry) { |
23 registry->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, | 24 registry->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, |
24 kDefaultPluginMessageResponseTimeout); | 25 kDefaultPluginMessageResponseTimeout); |
25 registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, | 26 registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, |
26 kDefaultHungPluginDetectFrequency); | 27 kDefaultHungPluginDetectFrequency); |
27 } | 28 } |
28 | 29 |
30 void RegisterBrowserViewSyncablePrefs( | |
31 user_prefs::PrefRegistrySyncable* registry) { | |
32 // TODO(mgiuca): Decide on this default depending on the window manager. See | |
33 // BrowserWindowGtk::GetCustomFramePrefDefault. | |
34 bool custom_frame_default = true; | |
35 | |
36 registry->RegisterBooleanPref( | |
37 prefs::kUseCustomChromeFrame, | |
38 custom_frame_default, | |
39 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
msw
2014/02/06 00:50:27
nit: why is the function called RegisterBrowserVie
Pam (message me for reviews)
2014/02/06 10:31:27
It's because the method takes a PrefRegistrySyncab
Matt Giuca
2014/02/11 04:57:43
Are you saying I should do that renaming now?
It'
msw
2014/02/11 19:32:59
Can't you just use the existing RegisterBrowserVie
Matt Giuca
2014/02/12 01:09:18
I assumed that the simple pref registry would caus
| |
40 } | |
41 | |
29 } // namespace chrome | 42 } // namespace chrome |
OLD | NEW |