chromeos/network/network_handler.cc - Issue 708563005: Use setProperties for IP Config.

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

Issue 708563005: Use setProperties for IP Config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430113_internet_options_1

Patch Set: IPConfigType=Static applies to NameServer only config Created 6 years 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

« chromeos/network/network_configuration_handler.cc ('K') | « chromeos/network/network_connection_handler_unittest.cc ('k') | chromeos/network/onc/onc_merger.cc » ('j') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/threading/worker_pool.h"	7 #include "base/threading/worker_pool.h"

8 #include "chromeos/dbus/dbus_thread_manager.h"	8 #include "chromeos/dbus/dbus_thread_manager.h"

9 #include "chromeos/network/auto_connect_handler.h"	9 #include "chromeos/network/auto_connect_handler.h"

10 #include "chromeos/network/client_cert_resolver.h"	10 #include "chromeos/network/client_cert_resolver.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 }	50 }

51	51

52 NetworkHandler::~NetworkHandler() {	52 NetworkHandler::~NetworkHandler() {

53 network_event_log::Shutdown();	53 network_event_log::Shutdown();

54 }	54 }

55	55

56 void NetworkHandler::Init() {	56 void NetworkHandler::Init() {

57 network_state_handler_->InitShillPropertyHandler();	57 network_state_handler_->InitShillPropertyHandler();

58 network_device_handler_->Init(network_state_handler_.get());	58 network_device_handler_->Init(network_state_handler_.get());

59 network_profile_handler_->Init();	59 network_profile_handler_->Init();

60 network_configuration_handler_->Init(network_state_handler_.get());	60 network_configuration_handler_->Init(network_state_handler_.get(),

	61 network_device_handler_.get());

61 managed_network_configuration_handler_->Init(	62 managed_network_configuration_handler_->Init(

62 network_state_handler_.get(),	63 network_state_handler_.get(),

63 network_profile_handler_.get(),	64 network_profile_handler_.get(),

64 network_configuration_handler_.get(),	65 network_configuration_handler_.get(),

65 network_device_handler_.get());	66 network_device_handler_.get());

66 network_connection_handler_->Init(	67 network_connection_handler_->Init(

67 network_state_handler_.get(),	68 network_state_handler_.get(),

68 network_configuration_handler_.get(),	69 network_configuration_handler_.get(),

69 managed_network_configuration_handler_.get());	70 managed_network_configuration_handler_.get());

70 if (network_cert_migrator_)	71 if (network_cert_migrator_)

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140	141

141 NetworkSmsHandler* NetworkHandler::network_sms_handler() {	142 NetworkSmsHandler* NetworkHandler::network_sms_handler() {

142 return network_sms_handler_.get();	143 return network_sms_handler_.get();

143 }	144 }

144	145

145 GeolocationHandler* NetworkHandler::geolocation_handler() {	146 GeolocationHandler* NetworkHandler::geolocation_handler() {

146 return geolocation_handler_.get();	147 return geolocation_handler_.get();

147 }	148 }

148	149

149 } // namespace chromeos	150 } // namespace chromeos

OLD	NEW