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

Side by Side Diff: chrome/browser/ui/webui/flags_ui.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/webui/flags_ui.h" 5 #include "chrome/browser/ui/webui/flags_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 21 matching lines...) Expand all
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 34
35 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
36 #include "base/sys_info.h" 36 #include "base/sys_info.h"
37 #include "chrome/browser/chromeos/login/user_manager.h" 37 #include "chrome/browser/chromeos/login/user_manager.h"
38 #include "chrome/browser/chromeos/settings/cros_settings.h" 38 #include "chrome/browser/chromeos/settings/cros_settings.h"
39 #include "chrome/browser/chromeos/settings/owner_flags_storage.h" 39 #include "chrome/browser/chromeos/settings/owner_flags_storage.h"
40 #include "chromeos/dbus/dbus_thread_manager.h" 40 #include "chromeos/dbus/dbus_thread_manager.h"
41 #include "chromeos/dbus/session_manager_client.h" 41 #include "chromeos/dbus/session_manager_client.h"
42 #include "components/user_prefs/pref_registry_syncable.h" 42 #include "components/pref_registry/pref_registry_syncable.h"
43 #endif 43 #endif
44 44
45 using content::WebContents; 45 using content::WebContents;
46 using content::WebUIMessageHandler; 46 using content::WebUIMessageHandler;
47 47
48 namespace { 48 namespace {
49 49
50 content::WebUIDataSource* CreateFlagsUIHTMLSource() { 50 content::WebUIDataSource* CreateFlagsUIHTMLSource() {
51 content::WebUIDataSource* source = 51 content::WebUIDataSource* source =
52 content::WebUIDataSource::Create(chrome::kChromeUIFlagsHost); 52 content::WebUIDataSource::Create(chrome::kChromeUIFlagsHost);
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 } 318 }
319 319
320 #if defined(OS_CHROMEOS) 320 #if defined(OS_CHROMEOS)
321 // static 321 // static
322 void FlagsUI::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 322 void FlagsUI::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
323 registry->RegisterListPref(prefs::kEnabledLabsExperiments, 323 registry->RegisterListPref(prefs::kEnabledLabsExperiments,
324 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 324 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
325 } 325 }
326 326
327 #endif 327 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/browser/ui/webui/instant_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698