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

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: Rebase + elim LoginState dependency 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 NetworkConfigurationUpdater* 331 NetworkConfigurationUpdater*
332 BrowserPolicyConnector::GetNetworkConfigurationUpdater() { 332 BrowserPolicyConnector::GetNetworkConfigurationUpdater() {
333 if (!network_configuration_updater_) { 333 if (!network_configuration_updater_) {
334 CommandLine* command_line = CommandLine::ForCurrentProcess(); 334 CommandLine* command_line = CommandLine::ForCurrentProcess();
335 if (command_line->HasSwitch( 335 if (command_line->HasSwitch(
336 chromeos::switches::kUseNewNetworkConfigurationHandlers)) { 336 chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
337 network_configuration_updater_.reset( 337 network_configuration_updater_.reset(
338 new NetworkConfigurationUpdaterImpl( 338 new NetworkConfigurationUpdaterImpl(
339 GetPolicyService(), 339 GetPolicyService(),
340 chromeos::ManagedNetworkConfigurationHandler::Get(),
341 make_scoped_ptr(new chromeos::CertificateHandler))); 340 make_scoped_ptr(new chromeos::CertificateHandler)));
342 } else { 341 } else {
343 network_configuration_updater_.reset( 342 network_configuration_updater_.reset(
344 new NetworkConfigurationUpdaterImplCros( 343 new NetworkConfigurationUpdaterImplCros(
345 GetPolicyService(), 344 GetPolicyService(),
346 chromeos::CrosLibrary::Get()->GetNetworkLibrary(), 345 chromeos::CrosLibrary::Get()->GetNetworkLibrary(),
347 make_scoped_ptr(new chromeos::CertificateHandler))); 346 make_scoped_ptr(new chromeos::CertificateHandler)));
348 } 347 }
349 } 348 }
350 return network_configuration_updater_.get(); 349 return network_configuration_updater_.get();
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 return new AsyncPolicyProvider(loader.Pass()); 484 return new AsyncPolicyProvider(loader.Pass());
486 } else { 485 } else {
487 return NULL; 486 return NULL;
488 } 487 }
489 #else 488 #else
490 return NULL; 489 return NULL;
491 #endif 490 #endif
492 } 491 }
493 492
494 } // namespace policy 493 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698