chrome/browser/chromeos/ui_proxy_config.cc - Issue 108563005: Move the cloud policy protobufs into the component.

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/ui_proxy_config.cc

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/browser/chromeos/settings/session_manager_operation_unittest.cc ('k') | chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/ui_proxy_config.h"	5 #include "chrome/browser/chromeos/ui_proxy_config.h"

6	6

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

8 #include "base/values.h"	8 #include "base/values.h"

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

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

11 #include "net/proxy/proxy_config.h"	11 #include "net/proxy/proxy_config.h"

12	12

13 namespace chromeos {	13 namespace chromeos {

14	14

15 UIProxyConfig::UIProxyConfig()	15 UIProxyConfig::UIProxyConfig()

16 : mode(MODE_DIRECT),	16 : mode(MODE_DIRECT),

17 state(ProxyPrefs::CONFIG_UNSET),	17 state(ProxyPrefs::CONFIG_UNSET),

18 user_modifiable(true) {	18 user_modifiable(true) {

19 }	19 }

(...skipping 140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 *spec += ';';	160 *spec += ';';

161	161

162 if (!url_scheme.empty()) {	162 if (!url_scheme.empty()) {

163 *spec += url_scheme;	163 *spec += url_scheme;

164 *spec += "=";	164 *spec += "=";

165 }	165 }

166 *spec += server.ToURI();	166 *spec += server.ToURI();

167 }	167 }

168	168

169 } // namespace chromeos	169 } // namespace chromeos

OLD	NEW