OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_CHROMEOS_STATUS_NETWORK_MENU_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ | 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 // Shows network details in DOM UI options window. | 180 // Shows network details in DOM UI options window. |
181 void ShowTabbedNetworkSettings(const Network& network) const; | 181 void ShowTabbedNetworkSettings(const Network& network) const; |
182 | 182 |
183 // Show a NetworkConfigView modal dialog instance. | 183 // Show a NetworkConfigView modal dialog instance. |
184 // TODO(stevenjb): deprecate this once all of the UI is embedded in the menu. | 184 // TODO(stevenjb): deprecate this once all of the UI is embedded in the menu. |
185 void ShowNetworkConfigView(NetworkConfigView* view, bool focus_login) const; | 185 void ShowNetworkConfigView(NetworkConfigView* view, bool focus_login) const; |
186 | 186 |
187 // Wrappers for the ShowNetworkConfigView / ShowTabbedNetworkSettings. | 187 // Wrappers for the ShowNetworkConfigView / ShowTabbedNetworkSettings. |
188 void ShowWifi(const WifiNetwork& wifi, bool focus_login) const; | 188 void ShowWifi(const WifiNetwork& wifi, bool focus_login) const; |
189 void ShowCellular(const CellularNetwork& cellular, bool focus_login) const; | 189 void ShowCellular(const CellularNetwork& cellular, bool focus_login) const; |
| 190 void ActivateCellular(const CellularNetwork& cellular) const; |
190 void ShowEthernet(const EthernetNetwork& ethernet) const; | 191 void ShowEthernet(const EthernetNetwork& ethernet) const; |
191 void ShowOther() const; | 192 void ShowOther() const; |
192 | 193 |
193 // Set to true if we are currently refreshing the menu. | 194 // Set to true if we are currently refreshing the menu. |
194 bool refreshing_menu_; | 195 bool refreshing_menu_; |
195 | 196 |
196 // The number of wifi strength images. | 197 // The number of wifi strength images. |
197 static const int kNumWifiImages; | 198 static const int kNumWifiImages; |
198 | 199 |
199 // Bars image resources. | 200 // Bars image resources. |
200 static const int kBarsImages[]; | 201 static const int kBarsImages[]; |
201 static const int kBarsImagesBlack[]; | 202 static const int kBarsImagesBlack[]; |
202 static const int kBarsImagesLowData[]; | 203 static const int kBarsImagesLowData[]; |
203 static const int kBarsImagesVLowData[]; | 204 static const int kBarsImagesVLowData[]; |
204 | 205 |
205 // Our menu items. | 206 // Our menu items. |
206 MenuItemVector menu_items_; | 207 MenuItemVector menu_items_; |
207 | 208 |
208 // The network menu. | 209 // The network menu. |
209 scoped_ptr<views::Menu2> network_menu_; | 210 scoped_ptr<views::Menu2> network_menu_; |
210 | 211 |
211 // Holds minimum width or -1 if it wasn't set up. | 212 // Holds minimum width or -1 if it wasn't set up. |
212 int min_width_; | 213 int min_width_; |
213 | 214 |
| 215 // If true, call into the settings UI for network configuration dialogs. |
| 216 bool use_settings_ui_; |
| 217 |
214 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); | 218 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); |
215 }; | 219 }; |
216 | 220 |
217 } // namespace chromeos | 221 } // namespace chromeos |
218 | 222 |
219 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ | 223 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
OLD | NEW |