chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/.

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

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 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

« no previous file with comments | « chrome/browser/chromeos/policy/network_configuration_updater.h ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 <ostream>	7 #include <ostream>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/json/json_string_value_serializer.h"	10 #include "base/json/json_string_value_serializer.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/prefs/pref_registry_simple.h"	12 #include "base/prefs/pref_registry_simple.h"

13 #include "base/prefs/pref_service.h"	13 #include "base/prefs/pref_service.h"

14 #include "base/string_util.h"	14 #include "base/string_util.h"

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/chromeos/cros/cros_library.h"	16 #include "chrome/browser/chromeos/cros/cros_library.h"

17 #include "chrome/browser/chromeos/cros/network_ui_data.h"	17 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"

18 #include "chrome/browser/chromeos/login/user_manager.h"	18 #include "chrome/browser/chromeos/login/user_manager.h"

19 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"	19 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

20 #include "chrome/browser/chromeos/settings/cros_settings.h"	20 #include "chrome/browser/chromeos/settings/cros_settings.h"

21 #include "chrome/browser/chromeos/settings/cros_settings_names.h"	21 #include "chrome/browser/chromeos/settings/cros_settings_names.h"

22 #include "chrome/browser/policy/browser_policy_connector.h"	22 #include "chrome/browser/policy/browser_policy_connector.h"

23 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"	23 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"

24 #include "chrome/browser/prefs/proxy_config_dictionary.h"	24 #include "chrome/browser/prefs/proxy_config_dictionary.h"

25 #include "chrome/browser/prefs/proxy_prefs.h"	25 #include "chrome/browser/prefs/proxy_prefs.h"

26 #include "chrome/browser/profiles/profile_manager.h"	26 #include "chrome/browser/profiles/profile_manager.h"

27 #include "chrome/common/chrome_notification_types.h"	27 #include "chrome/common/chrome_notification_types.h"

28 #include "chrome/common/pref_names.h"	28 #include "chrome/common/pref_names.h"

	29 #include "chromeos/network/network_ui_data.h"

29 #include "chromeos/network/onc/onc_constants.h"	30 #include "chromeos/network/onc/onc_constants.h"

30 #include "components/user_prefs/pref_registry_syncable.h"	31 #include "components/user_prefs/pref_registry_syncable.h"

31 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

32 #include "grit/generated_resources.h"	33 #include "grit/generated_resources.h"

33 #include "ui/base/l10n/l10n_util.h"	34 #include "ui/base/l10n/l10n_util.h"

34	35

35 namespace em = enterprise_management;	36 namespace em = enterprise_management;

36	37

37 namespace chromeos {	38 namespace chromeos {

38	39

(...skipping 833 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
872 device_config_.clear();	873 device_config_.clear();

873 return;	874 return;

874 }	875 }

875 if (!active_network_.empty()) {	876 if (!active_network_.empty()) {

876 VLOG(1) << "Try migrating device config to " << active_network_;	877 VLOG(1) << "Try migrating device config to " << active_network_;

877 SetProxyConfigForNetwork(active_network_, device_config_, true);	878 SetProxyConfigForNetwork(active_network_, device_config_, true);

878 }	879 }

879 }	880 }

880	881

881 } // namespace chromeos	882 } // namespace chromeos

OLD	NEW