| OLD | NEW |
| 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 "chromeos/network/shill_property_handler.h" | 5 #include "chromeos/network/shill_property_handler.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 AddPropertyUpdate(flimflam::kServicesProperty, service_path); | 60 AddPropertyUpdate(flimflam::kServicesProperty, service_path); |
| 61 } | 61 } |
| 62 | 62 |
| 63 virtual void UpdateDeviceProperty( | 63 virtual void UpdateDeviceProperty( |
| 64 const std::string& device_path, | 64 const std::string& device_path, |
| 65 const std::string& key, | 65 const std::string& key, |
| 66 const base::Value& value) OVERRIDE { | 66 const base::Value& value) OVERRIDE { |
| 67 AddPropertyUpdate(flimflam::kDevicesProperty, device_path); | 67 AddPropertyUpdate(flimflam::kDevicesProperty, device_path); |
| 68 } | 68 } |
| 69 | 69 |
| 70 virtual void ManagerPropertyChanged() OVERRIDE { | 70 virtual void NotifyManagerPropertyChanged() OVERRIDE { |
| 71 ++manager_updates_; | 71 ++manager_updates_; |
| 72 } | 72 } |
| 73 | 73 |
| 74 virtual void ManagedStateListChanged( | 74 virtual void ManagedStateListChanged( |
| 75 ManagedState::ManagedType type) OVERRIDE { | 75 ManagedState::ManagedType type) OVERRIDE { |
| 76 AddStateListUpdate(GetTypeString(type)); | 76 AddStateListUpdate(GetTypeString(type)); |
| 77 } | 77 } |
| 78 | 78 |
| 79 std::vector<std::string>& entries(const std::string& type) { | 79 std::vector<std::string>& entries(const std::string& type) { |
| 80 return entries_[type]; | 80 return entries_[type]; |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, | 418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, |
| 419 flimflam::kStateIdle, kTestIPConfigPath, true); | 419 flimflam::kStateIdle, kTestIPConfigPath, true); |
| 420 message_loop_.RunUntilIdle(); | 420 message_loop_.RunUntilIdle(); |
| 421 // A watched service with the IPConfig property already set must | 421 // A watched service with the IPConfig property already set must |
| 422 // trigger property updates for IP Address and DNS when added. | 422 // trigger property updates for IP Address and DNS when added. |
| 423 EXPECT_EQ(3, listener_-> | 423 EXPECT_EQ(3, listener_-> |
| 424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); | 424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); |
| 425 } | 425 } |
| 426 | 426 |
| 427 } // namespace chromeos | 427 } // namespace chromeos |
| OLD | NEW |