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

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

Issue 16512003: Configure networks requiring a certificate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add localized Auth error messages 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
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 28 matching lines...) Expand all
39 network_event_log::Shutdown(); 39 network_event_log::Shutdown();
40 } 40 }
41 41
42 void NetworkHandler::Init() { 42 void NetworkHandler::Init() {
43 network_state_handler_->InitShillPropertyHandler(); 43 network_state_handler_->InitShillPropertyHandler();
44 network_configuration_handler_->Init(network_state_handler_.get()); 44 network_configuration_handler_->Init(network_state_handler_.get());
45 managed_network_configuration_handler_->Init( 45 managed_network_configuration_handler_->Init(
46 network_state_handler_.get(), 46 network_state_handler_.get(),
47 network_profile_handler_.get(), 47 network_profile_handler_.get(),
48 network_configuration_handler_.get()); 48 network_configuration_handler_.get());
49 network_connection_handler_->Init(network_state_handler_.get(), 49 network_connection_handler_->Init(cert_loader_.get(),
50 network_state_handler_.get(),
50 network_configuration_handler_.get()); 51 network_configuration_handler_.get());
51 geolocation_handler_->Init(); 52 geolocation_handler_->Init();
52 } 53 }
53 54
54 // static 55 // static
55 void NetworkHandler::Initialize() { 56 void NetworkHandler::Initialize() {
56 CHECK(!g_network_handler); 57 CHECK(!g_network_handler);
57 g_network_handler = new NetworkHandler(); 58 g_network_handler = new NetworkHandler();
58 g_network_handler->Init(); 59 g_network_handler->Init();
59 } 60 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 101
101 NetworkConnectionHandler* NetworkHandler::network_connection_handler() { 102 NetworkConnectionHandler* NetworkHandler::network_connection_handler() {
102 return network_connection_handler_.get(); 103 return network_connection_handler_.get();
103 } 104 }
104 105
105 GeolocationHandler* NetworkHandler::geolocation_handler() { 106 GeolocationHandler* NetworkHandler::geolocation_handler() {
106 return geolocation_handler_.get(); 107 return geolocation_handler_.get();
107 } 108 }
108 109
109 } // namespace chromeos 110 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698