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

Side by Side Diff: chromeos/network/network_handler.cc

Issue 15649018: Call crypto::InitializeTPMToken on the IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, move declaration Created 7 years, 6 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 | « chromeos/network/cert_loader.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chromeos/network/network_handler.h" 5 #include "chromeos/network/network_handler.h"
6 6
7 #include "chromeos/dbus/dbus_thread_manager.h" 7 #include "chromeos/dbus/dbus_thread_manager.h"
8 #include "chromeos/network/cert_loader.h" 8 #include "chromeos/network/cert_loader.h"
9 #include "chromeos/network/geolocation_handler.h" 9 #include "chromeos/network/geolocation_handler.h"
10 #include "chromeos/network/managed_network_configuration_handler.h" 10 #include "chromeos/network/managed_network_configuration_handler.h"
(...skipping 22 matching lines...) Expand all
33 new ManagedNetworkConfigurationHandler()); 33 new ManagedNetworkConfigurationHandler());
34 network_connection_handler_.reset(new NetworkConnectionHandler()); 34 network_connection_handler_.reset(new NetworkConnectionHandler());
35 geolocation_handler_.reset(new GeolocationHandler()); 35 geolocation_handler_.reset(new GeolocationHandler());
36 } 36 }
37 37
38 NetworkHandler::~NetworkHandler() { 38 NetworkHandler::~NetworkHandler() {
39 network_event_log::Shutdown(); 39 network_event_log::Shutdown();
40 } 40 }
41 41
42 void NetworkHandler::Init() { 42 void NetworkHandler::Init() {
43 cert_loader_->Init();
43 network_state_handler_->InitShillPropertyHandler(); 44 network_state_handler_->InitShillPropertyHandler();
44 network_configuration_handler_->Init(network_state_handler_.get()); 45 network_configuration_handler_->Init(network_state_handler_.get());
45 managed_network_configuration_handler_->Init( 46 managed_network_configuration_handler_->Init(
46 network_state_handler_.get(), 47 network_state_handler_.get(),
47 network_profile_handler_.get(), 48 network_profile_handler_.get(),
48 network_configuration_handler_.get()); 49 network_configuration_handler_.get());
49 network_connection_handler_->Init(cert_loader_.get(), 50 network_connection_handler_->Init(cert_loader_.get(),
50 network_state_handler_.get(), 51 network_state_handler_.get(),
51 network_configuration_handler_.get()); 52 network_configuration_handler_.get());
52 geolocation_handler_->Init(); 53 geolocation_handler_->Init();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 102
102 NetworkConnectionHandler* NetworkHandler::network_connection_handler() { 103 NetworkConnectionHandler* NetworkHandler::network_connection_handler() {
103 return network_connection_handler_.get(); 104 return network_connection_handler_.get();
104 } 105 }
105 106
106 GeolocationHandler* NetworkHandler::geolocation_handler() { 107 GeolocationHandler* NetworkHandler::geolocation_handler() {
107 return geolocation_handler_.get(); 108 return geolocation_handler_.get();
108 } 109 }
109 110
110 } // namespace chromeos 111 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/cert_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698