chrome/browser/chromeos/policy/network_configuration_updater.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

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/policy/network_configuration_updater.cc

Issue 12189011: Split up chrome/browser/policy subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 7 years, 10 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

« chrome/browser/chromeos/login/oauth2_policy_fetcher.cc ('K') | « chrome/browser/chromeos/policy/network_configuration_updater.h ('k') | chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc » ('j') | chrome/browser/policy/browser_policy_connector.h » ('J')
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/policy/network_configuration_updater.h"	5 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"

6	6

7 #include <string>	7 #include <string>

8	8

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

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

11 #include "chrome/browser/chromeos/cros/network_library.h"	11 #include "chrome/browser/chromeos/cros/network_library.h"

12 #include "chrome/browser/policy/policy_map.h"	12 #include "chrome/browser/policy/policy_map.h"

13 #include "chromeos/network/onc/onc_constants.h"	13 #include "chromeos/network/onc/onc_constants.h"

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

15 #include "policy/policy_constants.h"	15 #include "policy/policy_constants.h"

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
101 if (new_network_config.empty())	101 if (new_network_config.empty())

102 new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;	102 new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;

103	103

104 if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source,	104 if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source,

105 allow_web_trust_)) {	105 allow_web_trust_)) {

106 LOG(ERROR) << "Errors occurred during the ONC policy application.";	106 LOG(ERROR) << "Errors occurred during the ONC policy application.";

107 }	107 }

108 }	108 }

109	109

110 } // namespace policy	110 } // namespace policy

OLD	NEW