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

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

Issue 948943003: Better support for Cellular roaming state in ONC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 years, 10 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
OLDNEW
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 #ifndef CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
6 #define CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 6 #define CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 base::DictionaryValue stub_properties_; 134 base::DictionaryValue stub_properties_;
135 135
136 // Dictionary of technology -> list of property dictionaries 136 // Dictionary of technology -> list of property dictionaries
137 base::DictionaryValue stub_geo_networks_; 137 base::DictionaryValue stub_geo_networks_;
138 138
139 // Seconds to delay interactive actions 139 // Seconds to delay interactive actions
140 int interactive_delay_; 140 int interactive_delay_;
141 141
142 // Initial state for fake services. 142 // Initial state for fake services.
143 std::map<std::string, std::string> shill_initial_state_map_; 143 std::map<std::string, std::string> shill_initial_state_map_;
144
145 // Roaming state for fake cellular service.
146 std::string roaming_state_;
147
144 typedef std::map<std::string, base::Value*> ShillPropertyMap; 148 typedef std::map<std::string, base::Value*> ShillPropertyMap;
145 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap; 149 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap;
146 DevicePropertyMap shill_device_property_map_; 150 DevicePropertyMap shill_device_property_map_;
147 151
148 ObserverList<ShillPropertyChangedObserver> observer_list_; 152 ObserverList<ShillPropertyChangedObserver> observer_list_;
149 153
150 // Track the default service for signaling Manager.DefaultService. 154 // Track the default service for signaling Manager.DefaultService.
151 std::string default_service_; 155 std::string default_service_;
152 156
153 // 'Best' service to connect to on ConnectToBestServices() calls. 157 // 'Best' service to connect to on ConnectToBestServices() calls.
154 std::string best_service_; 158 std::string best_service_;
155 159
156 // Note: This should remain the last member so it'll be destroyed and 160 // Note: This should remain the last member so it'll be destroyed and
157 // invalidate its weak pointers before any other members are destroyed. 161 // invalidate its weak pointers before any other members are destroyed.
158 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_; 162 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_;
159 163
160 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient); 164 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient);
161 }; 165 };
162 166
163 } // namespace chromeos 167 } // namespace chromeos
164 168
165 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 169 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/network_ui.cc ('k') | chromeos/dbus/fake_shill_manager_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698