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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 UpdateEntries(GetTypeString(type), entries); | 43 UpdateEntries(GetTypeString(type), entries); |
44 } | 44 } |
45 | 45 |
46 virtual void UpdateManagedStateProperties( | 46 virtual void UpdateManagedStateProperties( |
47 ManagedState::ManagedType type, | 47 ManagedState::ManagedType type, |
48 const std::string& path, | 48 const std::string& path, |
49 const base::DictionaryValue& properties) OVERRIDE { | 49 const base::DictionaryValue& properties) OVERRIDE { |
50 AddPropertyUpdate(GetTypeString(type), path); | 50 AddPropertyUpdate(GetTypeString(type), path); |
51 } | 51 } |
52 | 52 |
| 53 virtual void ProfileListChanged() OVERRIDE { |
| 54 } |
| 55 |
53 virtual void UpdateNetworkServiceProperty( | 56 virtual void UpdateNetworkServiceProperty( |
54 const std::string& service_path, | 57 const std::string& service_path, |
55 const std::string& key, | 58 const std::string& key, |
56 const base::Value& value) OVERRIDE { | 59 const base::Value& value) OVERRIDE { |
57 AddPropertyUpdate(flimflam::kServicesProperty, service_path); | 60 AddPropertyUpdate(flimflam::kServicesProperty, service_path); |
58 } | 61 } |
59 | 62 |
60 virtual void UpdateDeviceProperty( | 63 virtual void UpdateDeviceProperty( |
61 const std::string& device_path, | 64 const std::string& device_path, |
62 const std::string& key, | 65 const std::string& key, |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, | 418 AddServiceWithIPConfig(flimflam::kTypeWifi, kTestServicePath2, |
416 flimflam::kStateIdle, kTestIPConfigPath, true); | 419 flimflam::kStateIdle, kTestIPConfigPath, true); |
417 message_loop_.RunUntilIdle(); | 420 message_loop_.RunUntilIdle(); |
418 // A watched service with the IPConfig property already set must | 421 // A watched service with the IPConfig property already set must |
419 // trigger property updates for IP Address and DNS when added. | 422 // trigger property updates for IP Address and DNS when added. |
420 EXPECT_EQ(3, listener_-> | 423 EXPECT_EQ(3, listener_-> |
421 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); | 424 property_updates(flimflam::kServicesProperty)[kTestServicePath2]); |
422 } | 425 } |
423 | 426 |
424 } // namespace chromeos | 427 } // namespace chromeos |
OLD | NEW |