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: chrome/browser/ui/webui/options/chromeos/internet_options_handler.h

Issue 11367048: This is the first pass at making GetIPConfigs asynchronous. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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 (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 CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "chrome/browser/chromeos/cros/network_constants.h" 11 #include "chrome/browser/chromeos/cros/network_constants.h"
12 #include "chrome/browser/chromeos/cros/network_ip_config.h"
12 #include "chrome/browser/chromeos/cros/network_library.h" 13 #include "chrome/browser/chromeos/cros/network_library.h"
13 #include "chrome/browser/chromeos/cros/network_ui_data.h" 14 #include "chrome/browser/chromeos/cros/network_ui_data.h"
14 #include "chrome/browser/ui/webui/options/options_ui.h" 15 #include "chrome/browser/ui/webui/options/options_ui.h"
15 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
16 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
17 18
18 class Browser; 19 class Browser;
19 20
20 namespace gfx { 21 namespace gfx {
21 class ImageSkia; 22 class ImageSkia;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 * Wi-Fi can be reactivated. |args| is unused. 120 * Wi-Fi can be reactivated. |args| is unused.
120 */ 121 */
121 void ToggleAirplaneModeCallback(const ListValue* args); 122 void ToggleAirplaneModeCallback(const ListValue* args);
122 123
123 // Populates the ui with the details of the given device path. This forces 124 // Populates the ui with the details of the given device path. This forces
124 // an overlay to be displayed in the UI. 125 // an overlay to be displayed in the UI.
125 void PopulateDictionaryDetails(const chromeos::Network* network); 126 void PopulateDictionaryDetails(const chromeos::Network* network);
126 // This is the second half of PopulateDictionaryDetails after the asynchronous 127 // This is the second half of PopulateDictionaryDetails after the asynchronous
127 // request for Shill's service properties. 128 // request for Shill's service properties.
128 void PopulateDictionaryDetailsCallback( 129 void PopulateDictionaryDetailsCallback(
129 const chromeos::Network* network,
130 const std::string& service_path, 130 const std::string& service_path,
131 const base::DictionaryValue* shill_properties); 131 const base::DictionaryValue* shill_properties);
132 void PopulateIPConfigsCallback(
133 const std::string& service_path,
134 base::DictionaryValue* shill_properties,
135 const chromeos::NetworkIPConfigVector& ipconfigs,
136 const std::string& hardware_address);
132 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi, 137 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,
133 base::DictionaryValue* dictionary); 138 base::DictionaryValue* dictionary);
134 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax, 139 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,
135 base::DictionaryValue* dictionary); 140 base::DictionaryValue* dictionary);
136 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular, 141 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular,
137 base::DictionaryValue* dictionary); 142 base::DictionaryValue* dictionary);
138 143
139 // Converts CellularDataPlan structure into dictionary for JS. Formats plan 144 // Converts CellularDataPlan structure into dictionary for JS. Formats plan
140 // settings into human readable texts. 145 // settings into human readable texts.
141 base::DictionaryValue* CellularDataPlanToDictionary( 146 base::DictionaryValue* CellularDataPlanToDictionary(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // without worrying that they will actually try to happen after the lifetime 185 // without worrying that they will actually try to happen after the lifetime
181 // of this object. 186 // of this object.
182 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_; 187 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
183 188
184 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 189 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
185 }; 190 };
186 191
187 } // namespace options 192 } // namespace options
188 193
189 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 194 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698