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

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

Issue 954293003: Support badges and connecting animation in cr-network-icon element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More Feedback Created 5 years, 9 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
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | chromeos/dbus/fake_shill_manager_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 144
145 // Technology type for fake cellular service.
146 std::string cellular_technology_;
147
145 // Roaming state for fake cellular service. 148 // Roaming state for fake cellular service.
146 std::string roaming_state_; 149 std::string roaming_state_;
147 150
148 typedef std::map<std::string, base::Value*> ShillPropertyMap; 151 typedef std::map<std::string, base::Value*> ShillPropertyMap;
149 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap; 152 typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap;
150 DevicePropertyMap shill_device_property_map_; 153 DevicePropertyMap shill_device_property_map_;
151 154
152 ObserverList<ShillPropertyChangedObserver> observer_list_; 155 ObserverList<ShillPropertyChangedObserver> observer_list_;
153 156
154 // Track the default service for signaling Manager.DefaultService. 157 // Track the default service for signaling Manager.DefaultService.
155 std::string default_service_; 158 std::string default_service_;
156 159
157 // 'Best' service to connect to on ConnectToBestServices() calls. 160 // 'Best' service to connect to on ConnectToBestServices() calls.
158 std::string best_service_; 161 std::string best_service_;
159 162
160 // Note: This should remain the last member so it'll be destroyed and 163 // Note: This should remain the last member so it'll be destroyed and
161 // invalidate its weak pointers before any other members are destroyed. 164 // invalidate its weak pointers before any other members are destroyed.
162 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_; 165 base::WeakPtrFactory<FakeShillManagerClient> weak_ptr_factory_;
163 166
164 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient); 167 DISALLOW_COPY_AND_ASSIGN(FakeShillManagerClient);
165 }; 168 };
166 169
167 } // namespace chromeos 170 } // namespace chromeos
168 171
169 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_ 172 #endif // CHROMEOS_DBUS_FAKE_SHILL_MANAGER_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | chromeos/dbus/fake_shill_manager_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698