chrome/browser/chromeos/net/proxy_config_handler.cc - Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig

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

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add SchemeToString 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

« no previous file with comments | « chrome/browser/chromeos/net/onc_utils_unittest.cc ('k') | chrome/browser/chromeos/ui_proxy_config.h » ('j') | chromeos/network/onc/onc_utils.cc » ('J')

OLD	NEW
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/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "chromeos/dbus/dbus_thread_manager.h"	14 #include "chromeos/dbus/dbus_thread_manager.h"

15 #include "chromeos/dbus/shill_service_client.h"	15 #include "chromeos/dbus/shill_service_client.h"

16 #include "chromeos/network/network_handler_callbacks.h"	16 #include "chromeos/network/network_handler_callbacks.h"

17 #include "chromeos/network/network_profile.h"	17 #include "chromeos/network/network_profile.h"

18 #include "chromeos/network/network_profile_handler.h"	18 #include "chromeos/network/network_profile_handler.h"

19 #include "chromeos/network/network_state.h"	19 #include "chromeos/network/network_state.h"

20 #include "chromeos/network/network_state_handler.h"	20 #include "chromeos/network/network_state_handler.h"

	21 #include "chromeos/network/onc/onc_utils.h"

21 #include "components/pref_registry/pref_registry_syncable.h"	22 #include "components/pref_registry/pref_registry_syncable.h"

22 #include "components/proxy_config/proxy_config_dictionary.h"	23 #include "components/proxy_config/proxy_config_dictionary.h"

23 #include "dbus/object_path.h"	24 #include "dbus/object_path.h"

24 #include "third_party/cros_system_api/dbus/service_constants.h"	25 #include "third_party/cros_system_api/dbus/service_constants.h"

25	26

26 namespace chromeos {	27 namespace chromeos {

27	28

28 namespace {	29 namespace {

29	30

30 void NotifyNetworkStateHandler(const std::string& service_path) {	31 void NotifyNetworkStateHandler(const std::string& service_path) {

(...skipping 100 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131	132

132 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {	133 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

133 registry->RegisterBooleanPref(prefs::kUseSharedProxies, false);	134 registry->RegisterBooleanPref(prefs::kUseSharedProxies, false);

134	135

135 registry->RegisterListPref(prefs::kOpenNetworkConfiguration);	136 registry->RegisterListPref(prefs::kOpenNetworkConfiguration);

136 }	137 }

137	138

138 } // namespace proxy_config	139 } // namespace proxy_config

139	140

140 } // namespace chromeos	141 } // namespace chromeos

OLD	NEW