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

Side by Side Diff: chromeos/network/network_configuration_handler.h

Issue 243103004: Don't treat Shill ClearProperty errors as failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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
« no previous file with comments | « no previous file | chromeos/network/network_configuration_handler.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 (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 #ifndef CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_
6 #define CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_ 6 #define CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 const network_handler::ErrorCallback& error_callback, 141 const network_handler::ErrorCallback& error_callback,
142 const std::string& dbus_error_name, 142 const std::string& dbus_error_name,
143 const std::string& dbus_error_message); 143 const std::string& dbus_error_message);
144 144
145 // Invoke the callback and inform NetworkStateHandler to request an update 145 // Invoke the callback and inform NetworkStateHandler to request an update
146 // for the service after clearing properties. 146 // for the service after clearing properties.
147 void ClearPropertiesSuccessCallback( 147 void ClearPropertiesSuccessCallback(
148 const std::string& service_path, 148 const std::string& service_path,
149 const std::vector<std::string>& names, 149 const std::vector<std::string>& names,
150 const base::Closure& callback, 150 const base::Closure& callback,
151 const network_handler::ErrorCallback& error_callback,
152 const base::ListValue& result); 151 const base::ListValue& result);
153 void ClearPropertiesErrorCallback( 152 void ClearPropertiesErrorCallback(
154 const std::string& service_path, 153 const std::string& service_path,
155 const network_handler::ErrorCallback& error_callback, 154 const network_handler::ErrorCallback& error_callback,
156 const std::string& dbus_error_name, 155 const std::string& dbus_error_name,
157 const std::string& dbus_error_message); 156 const std::string& dbus_error_message);
158 157
159 // Unowned associated NetworkStateHandler* (global or test instance). 158 // Unowned associated NetworkStateHandler* (global or test instance).
160 NetworkStateHandler* network_state_handler_; 159 NetworkStateHandler* network_state_handler_;
161 160
162 // Map of in-progress deleter instances. Owned by this class. 161 // Map of in-progress deleter instances. Owned by this class.
163 std::map<std::string, ProfileEntryDeleter*> profile_entry_deleters_; 162 std::map<std::string, ProfileEntryDeleter*> profile_entry_deleters_;
164 163
165 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationHandler); 164 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationHandler);
166 }; 165 };
167 166
168 } // namespace chromeos 167 } // namespace chromeos
169 168
170 #endif // CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_ 169 #endif // CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/network_configuration_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698