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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h

Issue 10827283: This updates the StaticIP configuration UI to match new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 8 years, 4 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) 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_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_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"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 /** 119 /**
120 * Toggle airplane mode. Disables all wireless networks when activated. 120 * Toggle airplane mode. Disables all wireless networks when activated.
121 * Celluar and Bluetooth connections remain disabled while active, but 121 * Celluar and Bluetooth connections remain disabled while active, but
122 * Wi-Fi can be reactivated. |args| is unused. 122 * Wi-Fi can be reactivated. |args| is unused.
123 */ 123 */
124 void ToggleAirplaneModeCallback(const ListValue* args); 124 void ToggleAirplaneModeCallback(const ListValue* args);
125 125
126 // Populates the ui with the details of the given device path. This forces 126 // Populates the ui with the details of the given device path. This forces
127 // an overlay to be displayed in the UI. 127 // an overlay to be displayed in the UI.
128 void PopulateDictionaryDetails(const chromeos::Network* network); 128 void PopulateDictionaryDetails(const chromeos::Network* network);
129 // This is the second half of PopulateDictionaryDetails after the asynchronous
130 // request for Shill's service properties.
131 void PopulateDictionaryDetailsCallback(
132 const chromeos::Network* network,
133 const std::string& service_path,
134 const base::DictionaryValue* shill_properties);
129 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi, 135 void PopulateWifiDetails(const chromeos::WifiNetwork* wifi,
130 base::DictionaryValue* dictionary); 136 base::DictionaryValue* dictionary);
131 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax, 137 void PopulateWimaxDetails(const chromeos::WimaxNetwork* wimax,
132 base::DictionaryValue* dictionary); 138 base::DictionaryValue* dictionary);
133 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular, 139 void PopulateCellularDetails(const chromeos::CellularNetwork* cellular,
134 base::DictionaryValue* dictionary); 140 base::DictionaryValue* dictionary);
135 void PopulateVPNDetails(const chromeos::VirtualNetwork* vpn, 141 void PopulateVPNDetails(const chromeos::VirtualNetwork* vpn,
136 base::DictionaryValue* dictionary); 142 base::DictionaryValue* dictionary);
137 143
138 // Converts CellularDataPlan structure into dictionary for JS. Formats plan 144 // Converts CellularDataPlan structure into dictionary for JS. Formats plan
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // without worrying that they will actually try to happen after the lifetime 184 // without worrying that they will actually try to happen after the lifetime
179 // of this object. 185 // of this object.
180 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_; 186 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
181 187
182 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 188 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
183 }; 189 };
184 190
185 } // namespace options2 191 } // namespace options2
186 192
187 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_ 193 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698