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

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

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 329
330 NetworkConfigurationUpdater* 330 NetworkConfigurationUpdater*
331 BrowserPolicyConnector::GetNetworkConfigurationUpdater() { 331 BrowserPolicyConnector::GetNetworkConfigurationUpdater() {
332 if (!network_configuration_updater_) { 332 if (!network_configuration_updater_) {
333 CommandLine* command_line = CommandLine::ForCurrentProcess(); 333 CommandLine* command_line = CommandLine::ForCurrentProcess();
334 if (command_line->HasSwitch( 334 if (command_line->HasSwitch(
335 chromeos::switches::kUseNewNetworkConfigurationHandlers)) { 335 chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
336 network_configuration_updater_.reset( 336 network_configuration_updater_.reset(
337 new NetworkConfigurationUpdaterImpl( 337 new NetworkConfigurationUpdaterImpl(
338 GetPolicyService(), 338 GetPolicyService(),
339 chromeos::ManagedNetworkConfigurationHandler::Get(),
340 make_scoped_ptr(new chromeos::CertificateHandler))); 339 make_scoped_ptr(new chromeos::CertificateHandler)));
341 } else { 340 } else {
342 network_configuration_updater_.reset( 341 network_configuration_updater_.reset(
343 new NetworkConfigurationUpdaterImplCros( 342 new NetworkConfigurationUpdaterImplCros(
344 GetPolicyService(), 343 GetPolicyService(),
345 chromeos::CrosLibrary::Get()->GetNetworkLibrary(), 344 chromeos::CrosLibrary::Get()->GetNetworkLibrary(),
346 make_scoped_ptr(new chromeos::CertificateHandler))); 345 make_scoped_ptr(new chromeos::CertificateHandler)));
347 } 346 }
348 } 347 }
349 return network_configuration_updater_.get(); 348 return network_configuration_updater_.get();
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 return new AsyncPolicyProvider(loader.Pass()); 483 return new AsyncPolicyProvider(loader.Pass());
485 } else { 484 } else {
486 return NULL; 485 return NULL;
487 } 486 }
488 #else 487 #else
489 return NULL; 488 return NULL;
490 #endif 489 #endif
491 } 490 }
492 491
493 } // namespace policy 492 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698