Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 10386176: Revert "Refactored NetworkConfigurationUpdater to read policy from the PolicyService." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/policy/network_configuration_updater.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser_policy_connector.h" 5 #include "chrome/browser/policy/browser_policy_connector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 this, 137 this,
138 GetChromePolicyDefinitionList(), 138 GetChromePolicyDefinitionList(),
139 POLICY_LEVEL_RECOMMENDED)); 139 POLICY_LEVEL_RECOMMENDED));
140 } 140 }
141 141
142 InitializeDevicePolicy(); 142 InitializeDevicePolicy();
143 143
144 if (command_line->HasSwitch(switches::kEnableONCPolicy)) { 144 if (command_line->HasSwitch(switches::kEnableONCPolicy)) {
145 network_configuration_updater_.reset( 145 network_configuration_updater_.reset(
146 new NetworkConfigurationUpdater( 146 new NetworkConfigurationUpdater(
147 g_browser_process->policy_service(), 147 managed_cloud_provider_.get(),
148 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); 148 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
149 } 149 }
150 150
151 // Create the AppPackUpdater to start updating the cache. It requires the 151 // Create the AppPackUpdater to start updating the cache. It requires the
152 // system request context, which isn't available yet; therefore it is 152 // system request context, which isn't available yet; therefore it is
153 // created only once the loops are running. 153 // created only once the loops are running.
154 MessageLoop::current()->PostTask( 154 MessageLoop::current()->PostTask(
155 FROM_HERE, 155 FROM_HERE,
156 base::Bind(base::IgnoreResult(&BrowserPolicyConnector::GetAppPackUpdater), 156 base::Bind(base::IgnoreResult(&BrowserPolicyConnector::GetAppPackUpdater),
157 weak_ptr_factory_.GetWeakPtr())); 157 weak_ptr_factory_.GetWeakPtr()));
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 555 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
556 } else { 556 } else {
557 return NULL; 557 return NULL;
558 } 558 }
559 #else 559 #else
560 return NULL; 560 return NULL;
561 #endif 561 #endif
562 } 562 }
563 563
564 } // namespace policy 564 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/network_configuration_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698