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

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

Issue 271793003: components: Extract pref_registry component out of user_prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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
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/pref_registry/pref_registry_syncable.h"
10 10
11 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 11 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
12 #include "ui/base/x/x11_util.h" 12 #include "ui/base/x/x11_util.h"
13 #endif 13 #endif
14 14
15 namespace { 15 namespace {
16 16
17 // 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).
18 const int kDefaultPluginMessageResponseTimeout = 25000; 18 const int kDefaultPluginMessageResponseTimeout = 25000;
19 19
(...skipping 18 matching lines...) Expand all
38 custom_frame_default = ui::GetCustomFramePrefDefault(); 38 custom_frame_default = ui::GetCustomFramePrefDefault();
39 #endif 39 #endif
40 40
41 registry->RegisterBooleanPref( 41 registry->RegisterBooleanPref(
42 prefs::kUseCustomChromeFrame, 42 prefs::kUseCustomChromeFrame,
43 custom_frame_default, 43 custom_frame_default,
44 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 44 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
45 } 45 }
46 46
47 } // namespace chrome 47 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_ui_prefs.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698