chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 4 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/login/wizard_controller.cc ('k') | chrome/browser/chromeos/settings/OWNERS » ('j') | no next file with comments »

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/string_util.h"	12 #include "base/string_util.h"

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

14 #include "chrome/browser/chromeos/cros/onc_constants.h"	14 #include "chrome/browser/chromeos/cros/onc_constants.h"

15 #include "chrome/browser/chromeos/cros_settings.h"

16 #include "chrome/browser/chromeos/cros_settings_names.h"

17 #include "chrome/browser/chromeos/login/user_manager.h"	15 #include "chrome/browser/chromeos/login/user_manager.h"

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

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

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

19 #include "chrome/browser/prefs/pref_service.h"	19 #include "chrome/browser/prefs/pref_service.h"

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

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

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

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

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

25 #include "content/public/browser/notification_service.h"	25 #include "content/public/browser/notification_service.h"

26 #include "grit/generated_resources.h"	26 #include "grit/generated_resources.h"

27 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

(...skipping 810 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
838 device_config_.clear();	838 device_config_.clear();

839 return;	839 return;

840 }	840 }

841 if (!active_network_.empty()) {	841 if (!active_network_.empty()) {

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

843 SetProxyConfigForNetwork(active_network_, device_config_, true);	843 SetProxyConfigForNetwork(active_network_, device_config_, true);

844 }	844 }

845 }	845 }

846	846

847 } // namespace chromeos	847 } // namespace chromeos

OLD	NEW