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

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

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 5 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) 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/net/onc_utils.h" 5 #include "chrome/browser/chromeos/net/onc_utils.h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.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_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/ui_proxy_config.h" 12 #include "chrome/browser/chromeos/ui_proxy_config.h"
13 #include "chrome/browser/prefs/proxy_config_dictionary.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
15 #include "chromeos/network/managed_network_configuration_handler.h" 14 #include "chromeos/network/managed_network_configuration_handler.h"
16 #include "chromeos/network/network_configuration_handler.h" 15 #include "chromeos/network/network_configuration_handler.h"
17 #include "chromeos/network/network_handler.h" 16 #include "chromeos/network/network_handler.h"
18 #include "chromeos/network/network_profile.h" 17 #include "chromeos/network/network_profile.h"
19 #include "chromeos/network/network_profile_handler.h" 18 #include "chromeos/network/network_profile_handler.h"
20 #include "chromeos/network/network_state.h" 19 #include "chromeos/network/network_state.h"
21 #include "chromeos/network/network_state_handler.h" 20 #include "chromeos/network/network_state_handler.h"
22 #include "chromeos/network/network_ui_data.h" 21 #include "chromeos/network/network_ui_data.h"
23 #include "chromeos/network/onc/onc_normalizer.h" 22 #include "chromeos/network/onc/onc_normalizer.h"
24 #include "chromeos/network/onc/onc_signature.h" 23 #include "chromeos/network/onc/onc_signature.h"
25 #include "chromeos/network/onc/onc_translator.h" 24 #include "chromeos/network/onc/onc_translator.h"
26 #include "chromeos/network/onc/onc_utils.h" 25 #include "chromeos/network/onc/onc_utils.h"
26 #include "components/proxy_config/proxy_config_dictionary.h"
27 #include "components/user_manager/user.h" 27 #include "components/user_manager/user.h"
28 #include "components/user_manager/user_manager.h" 28 #include "components/user_manager/user_manager.h"
29 #include "net/base/host_port_pair.h" 29 #include "net/base/host_port_pair.h"
30 #include "net/proxy/proxy_bypass_rules.h" 30 #include "net/proxy/proxy_bypass_rules.h"
31 #include "net/proxy/proxy_server.h" 31 #include "net/proxy/proxy_server.h"
32 #include "third_party/cros_system_api/dbus/service_constants.h" 32 #include "third_party/cros_system_api/dbus/service_constants.h"
33 #include "url/gurl.h" 33 #include "url/gurl.h"
34 34
35 namespace chromeos { 35 namespace chromeos {
36 namespace onc { 36 namespace onc {
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 const PrefService* local_state_prefs, 452 const PrefService* local_state_prefs,
453 const NetworkState& network) { 453 const NetworkState& network) {
454 ::onc::ONCSource ignored_onc_source; 454 ::onc::ONCSource ignored_onc_source;
455 const base::DictionaryValue* policy = onc::GetPolicyForNetwork( 455 const base::DictionaryValue* policy = onc::GetPolicyForNetwork(
456 profile_prefs, local_state_prefs, network, &ignored_onc_source); 456 profile_prefs, local_state_prefs, network, &ignored_onc_source);
457 return policy != NULL; 457 return policy != NULL;
458 } 458 }
459 459
460 } // namespace onc 460 } // namespace onc
461 } // namespace chromeos 461 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.h ('k') | chrome/browser/chromeos/net/proxy_config_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698