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

Side by Side Diff: chromeos/dbus/shill_service_client_stub.h

Issue 12634019: NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AddServiceWithIPConfig Created 7 years, 8 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_ 5 #ifndef CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_
6 #define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_ 6 #define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 const dbus::ObjectPath& service_path, 66 const dbus::ObjectPath& service_path,
67 const std::string& carrier) OVERRIDE; 67 const std::string& carrier) OVERRIDE;
68 virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE; 68 virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE;
69 69
70 // ShillServiceClient::TestInterface overrides. 70 // ShillServiceClient::TestInterface overrides.
71 virtual void AddService(const std::string& service_path, 71 virtual void AddService(const std::string& service_path,
72 const std::string& name, 72 const std::string& name,
73 const std::string& type, 73 const std::string& type,
74 const std::string& state, 74 const std::string& state,
75 bool add_to_watch_list) OVERRIDE; 75 bool add_to_watch_list) OVERRIDE;
76 virtual void AddServiceWithIPConfig(const std::string& service_path,
77 const std::string& name,
78 const std::string& type,
79 const std::string& state,
80 const std::string& ipconfig_path,
81 bool add_to_watch_list) OVERRIDE;
76 virtual void RemoveService(const std::string& service_path) OVERRIDE; 82 virtual void RemoveService(const std::string& service_path) OVERRIDE;
77 virtual void SetServiceProperty(const std::string& service_path, 83 virtual void SetServiceProperty(const std::string& service_path,
78 const std::string& property, 84 const std::string& property,
79 const base::Value& value) OVERRIDE; 85 const base::Value& value) OVERRIDE;
80 virtual const base::DictionaryValue* GetServiceProperties( 86 virtual const base::DictionaryValue* GetServiceProperties(
81 const std::string& service_path) const OVERRIDE; 87 const std::string& service_path) const OVERRIDE;
82 virtual void ClearServices() OVERRIDE; 88 virtual void ClearServices() OVERRIDE;
83 89
84 private: 90 private:
85 typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList; 91 typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList;
86 92
93 void AddServiceInternal(const std::string& service_path,
94 const std::string& name,
95 const std::string& type,
96 const std::string& state,
97 const std::string& ipconfig_path,
98 bool add_to_watch_list);
87 void SetDefaultProperties(); 99 void SetDefaultProperties();
88 void PassStubServiceProperties(const dbus::ObjectPath& service_path, 100 void PassStubServiceProperties(const dbus::ObjectPath& service_path,
89 const DictionaryValueCallback& callback); 101 const DictionaryValueCallback& callback);
90 void NotifyObserversPropertyChanged(const dbus::ObjectPath& service_path, 102 void NotifyObserversPropertyChanged(const dbus::ObjectPath& service_path,
91 const std::string& property); 103 const std::string& property);
92 base::DictionaryValue* GetModifiableServiceProperties( 104 base::DictionaryValue* GetModifiableServiceProperties(
93 const std::string& service_path); 105 const std::string& service_path);
94 PropertyObserverList& GetObserverList(const dbus::ObjectPath& device_path); 106 PropertyObserverList& GetObserverList(const dbus::ObjectPath& device_path);
95 107
96 base::DictionaryValue stub_services_; 108 base::DictionaryValue stub_services_;
97 // Observer list for each service. 109 // Observer list for each service.
98 std::map<dbus::ObjectPath, PropertyObserverList*> observer_list_; 110 std::map<dbus::ObjectPath, PropertyObserverList*> observer_list_;
99 111
100 // Note: This should remain the last member so it'll be destroyed and 112 // Note: This should remain the last member so it'll be destroyed and
101 // invalidate its weak pointers before any other members are destroyed. 113 // invalidate its weak pointers before any other members are destroyed.
102 base::WeakPtrFactory<ShillServiceClientStub> weak_ptr_factory_; 114 base::WeakPtrFactory<ShillServiceClientStub> weak_ptr_factory_;
103 115
104 DISALLOW_COPY_AND_ASSIGN(ShillServiceClientStub); 116 DISALLOW_COPY_AND_ASSIGN(ShillServiceClientStub);
105 }; 117 };
106 118
107 } // namespace chromeos 119 } // namespace chromeos
108 120
109 #endif // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_ 121 #endif // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698