Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: chrome/browser/ui/browser_view_prefs.cc

Issue 174223004: linux_aura: Default to system titlebars under some window managers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "components/user_prefs/pref_registry_syncable.h"
10 10
11 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
12 #include "ui/base/x/x11_util.h"
13 #endif
14
11 namespace { 15 namespace {
12 16
13 // How long do we wait before we consider a window hung (in ms). 17 // How long do we wait before we consider a window hung (in ms).
14 const int kDefaultPluginMessageResponseTimeout = 25000; 18 const int kDefaultPluginMessageResponseTimeout = 25000;
15 19
16 // How frequently we check for hung plugin windows. 20 // How frequently we check for hung plugin windows.
17 const int kDefaultHungPluginDetectFrequency = 2000; 21 const int kDefaultHungPluginDetectFrequency = 2000;
18 22
19 } // namespace 23 } // namespace
20 24
21 namespace chrome { 25 namespace chrome {
22 26
23 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) { 27 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) {
24 registry->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, 28 registry->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout,
25 kDefaultPluginMessageResponseTimeout); 29 kDefaultPluginMessageResponseTimeout);
26 registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, 30 registry->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
27 kDefaultHungPluginDetectFrequency); 31 kDefaultHungPluginDetectFrequency);
28 } 32 }
29 33
30 void RegisterBrowserViewProfilePrefs( 34 void RegisterBrowserViewProfilePrefs(
31 user_prefs::PrefRegistrySyncable* registry) { 35 user_prefs::PrefRegistrySyncable* registry) {
32 // TODO(mgiuca): Decide on this default depending on the window manager. See 36 bool custom_frame_default = false;
33 // BrowserWindowGtk::GetCustomFramePrefDefault. 37 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
34 bool custom_frame_default = true; 38 custom_frame_default = ui::GetCustomFramePrefDefault();
39 #endif
35 40
36 registry->RegisterBooleanPref( 41 registry->RegisterBooleanPref(
37 prefs::kUseCustomChromeFrame, 42 prefs::kUseCustomChromeFrame,
38 custom_frame_default, 43 custom_frame_default,
39 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 44 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
40 } 45 }
41 46
42 } // namespace chrome 47 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698