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

Side by Side Diff: chrome/browser/chromeos/net/proxy_config_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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"
11 #include "base/values.h" 10 #include "base/values.h"
12 #include "chrome/browser/chromeos/net/onc_utils.h" 11 #include "chrome/browser/chromeos/net/onc_utils.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/dbus/shill_service_client.h" 14 #include "chromeos/dbus/shill_service_client.h"
16 #include "chromeos/network/network_handler_callbacks.h" 15 #include "chromeos/network/network_handler_callbacks.h"
17 #include "chromeos/network/network_profile.h" 16 #include "chromeos/network/network_profile.h"
18 #include "chromeos/network/network_profile_handler.h" 17 #include "chromeos/network/network_profile_handler.h"
19 #include "chromeos/network/network_state.h" 18 #include "chromeos/network/network_state.h"
20 #include "chromeos/network/network_state_handler.h" 19 #include "chromeos/network/network_state_handler.h"
21 #include "chromeos/network/onc/onc_utils.h" 20 #include "chromeos/network/onc/onc_utils.h"
22 #include "components/pref_registry/pref_registry_syncable.h" 21 #include "components/pref_registry/pref_registry_syncable.h"
22 #include "components/prefs/pref_registry_simple.h"
23 #include "components/proxy_config/proxy_config_dictionary.h" 23 #include "components/proxy_config/proxy_config_dictionary.h"
24 #include "dbus/object_path.h" 24 #include "dbus/object_path.h"
25 #include "third_party/cros_system_api/dbus/service_constants.h" 25 #include "third_party/cros_system_api/dbus/service_constants.h"
26 26
27 namespace chromeos { 27 namespace chromeos {
28 28
29 namespace { 29 namespace {
30 30
31 void NotifyNetworkStateHandler(const std::string& service_path) { 31 void NotifyNetworkStateHandler(const std::string& service_path) {
32 if (NetworkHandler::IsInitialized()) { 32 if (NetworkHandler::IsInitialized()) {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 133 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
134 registry->RegisterBooleanPref(prefs::kUseSharedProxies, false); 134 registry->RegisterBooleanPref(prefs::kUseSharedProxies, false);
135 135
136 registry->RegisterListPref(prefs::kOpenNetworkConfiguration); 136 registry->RegisterListPref(prefs::kOpenNetworkConfiguration);
137 } 137 }
138 138
139 } // namespace proxy_config 139 } // namespace proxy_config
140 140
141 } // namespace chromeos 141 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698