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: Add managed indicator to userNameServers, feedback, fix tests Created 5 years, 11 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

« chrome/browser/resources/options/chromeos/internet_detail.html ('K') | « chromeos/network/network_connection_handler_unittest.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »
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 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 geolocation_handler_.reset(new GeolocationHandler());	46 geolocation_handler_.reset(new GeolocationHandler());

47 }	47 }

48	48

49 NetworkHandler::~NetworkHandler() {	49 NetworkHandler::~NetworkHandler() {

50 }	50 }

51	51

52 void NetworkHandler::Init() {	52 void NetworkHandler::Init() {

53 network_state_handler_->InitShillPropertyHandler();	53 network_state_handler_->InitShillPropertyHandler();

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

55 network_profile_handler_->Init();	55 network_profile_handler_->Init();

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

	57 network_device_handler_.get());

57 managed_network_configuration_handler_->Init(	58 managed_network_configuration_handler_->Init(

58 network_state_handler_.get(),	59 network_state_handler_.get(),

59 network_profile_handler_.get(),	60 network_profile_handler_.get(),

60 network_configuration_handler_.get(),	61 network_configuration_handler_.get(),

61 network_device_handler_.get());	62 network_device_handler_.get());

62 network_connection_handler_->Init(	63 network_connection_handler_->Init(

63 network_state_handler_.get(),	64 network_state_handler_.get(),

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

65 managed_network_configuration_handler_.get());	66 managed_network_configuration_handler_.get());

66 if (network_cert_migrator_)	67 if (network_cert_migrator_)

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136	137

137 NetworkSmsHandler* NetworkHandler::network_sms_handler() {	138 NetworkSmsHandler* NetworkHandler::network_sms_handler() {

138 return network_sms_handler_.get();	139 return network_sms_handler_.get();

139 }	140 }

140	141

141 GeolocationHandler* NetworkHandler::geolocation_handler() {	142 GeolocationHandler* NetworkHandler::geolocation_handler() {

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

143 }	144 }

144	145

145 } // namespace chromeos	146 } // namespace chromeos

OLD	NEW