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

Side by Side Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 109743002: Move policy code into components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar fixes Created 7 years 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/chromeos/proxy_config_service_impl.h" 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chromeos/login/user_manager.h" 15 #include "chrome/browser/chromeos/login/user_manager.h"
16 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 16 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
17 #include "chrome/browser/policy/browser_policy_connector.h" 17 #include "chrome/browser/policy/browser_policy_connector.h"
18 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
19 #include "chrome/browser/prefs/proxy_config_dictionary.h" 18 #include "chrome/browser/prefs/proxy_config_dictionary.h"
20 #include "chrome/browser/prefs/proxy_prefs.h" 19 #include "chrome/browser/prefs/proxy_prefs.h"
21 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
22 #include "chromeos/network/favorite_state.h" 21 #include "chromeos/network/favorite_state.h"
23 #include "chromeos/network/network_profile.h" 22 #include "chromeos/network/network_profile.h"
24 #include "chromeos/network/network_profile_handler.h" 23 #include "chromeos/network/network_profile_handler.h"
25 #include "chromeos/network/network_state.h" 24 #include "chromeos/network/network_state.h"
26 #include "chromeos/network/network_state_handler.h" 25 #include "chromeos/network/network_state_handler.h"
27 #include "chromeos/network/onc/onc_utils.h" 26 #include "chromeos/network/onc/onc_utils.h"
27 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
28 28
29 namespace chromeos { 29 namespace chromeos {
30 30
31 namespace { 31 namespace {
32 32
33 // Writes the proxy config of |network| to |proxy_config|. Set |onc_source| to 33 // Writes the proxy config of |network| to |proxy_config|. Set |onc_source| to
34 // the source of this configuration. Returns false if no 34 // the source of this configuration. Returns false if no
35 // proxy was configured for this network. 35 // proxy was configured for this network.
36 bool GetProxyConfig(const PrefService* profile_prefs, 36 bool GetProxyConfig(const PrefService* profile_prefs,
37 const PrefService* local_state_prefs, 37 const PrefService* local_state_prefs,
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. 225 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful.
226 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); 226 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue());
227 VLOG(1) << this << ": Proxy changed: " 227 VLOG(1) << this << ": Proxy changed: "
228 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) 228 << ProxyPrefs::ConfigStateToDebugString(active_config_state_)
229 << ", " << *config_dict; 229 << ", " << *config_dict;
230 } 230 }
231 } 231 }
232 } 232 }
233 233
234 } // namespace chromeos 234 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/user_policy_token_loader.cc ('k') | chrome/browser/chromeos/settings/cros_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698