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

Side by Side Diff: chrome/browser/chromeos/net/proxy_config_handler.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/net/proxy_config_handler.h" 5 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/net/onc_utils.h" 12 #include "chrome/browser/chromeos/net/onc_utils.h"
13 #include "chrome/browser/prefs/proxy_config_dictionary.h" 13 #include "chrome/browser/prefs/proxy_config_dictionary.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "chromeos/dbus/shill_service_client.h" 16 #include "chromeos/dbus/shill_service_client.h"
17 #include "chromeos/network/favorite_state.h" 17 #include "chromeos/network/favorite_state.h"
18 #include "chromeos/network/network_handler_callbacks.h" 18 #include "chromeos/network/network_handler_callbacks.h"
19 #include "chromeos/network/network_profile.h" 19 #include "chromeos/network/network_profile.h"
20 #include "chromeos/network/network_profile_handler.h" 20 #include "chromeos/network/network_profile_handler.h"
21 #include "chromeos/network/network_state_handler.h" 21 #include "chromeos/network/network_state_handler.h"
22 #include "components/user_prefs/pref_registry_syncable.h" 22 #include "components/pref_registry/pref_registry_syncable.h"
23 #include "dbus/object_path.h" 23 #include "dbus/object_path.h"
24 #include "third_party/cros_system_api/dbus/service_constants.h" 24 #include "third_party/cros_system_api/dbus/service_constants.h"
25 25
26 namespace chromeos { 26 namespace chromeos {
27 27
28 namespace { 28 namespace {
29 29
30 void NotifyNetworkStateHandler(const std::string& service_path) { 30 void NotifyNetworkStateHandler(const std::string& service_path) {
31 if (NetworkHandler::IsInitialized()) { 31 if (NetworkHandler::IsInitialized()) {
32 NetworkHandler::Get()->network_state_handler()->RequestUpdateForNetwork( 32 NetworkHandler::Get()->network_state_handler()->RequestUpdateForNetwork(
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 false, 135 false,
136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
137 137
138 registry->RegisterListPref(prefs::kOpenNetworkConfiguration, 138 registry->RegisterListPref(prefs::kOpenNetworkConfiguration,
139 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 139 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
140 } 140 }
141 141
142 } // namespace proxy_config 142 } // namespace proxy_config
143 143
144 } // namespace chromeos 144 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698