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

Side by Side Diff: ash/system/tray/system_tray_delegate.h

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Feedback Round 1 Created 7 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 ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/i18n/time_formatting.h" 14 #include "base/i18n/time_formatting.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "ui/gfx/image/image_skia.h" 17 #include "ui/gfx/image/image_skia.h"
18 #include "ui/gfx/native_widget_types.h"
18 19
19 namespace base { 20 namespace base {
20 class TimeDelta; 21 class TimeDelta;
21 class TimeTicks; 22 class TimeTicks;
22 } 23 }
23 24
24 namespace ash { 25 namespace ash {
25 26
26 struct ASH_EXPORT NetworkIconInfo { 27 struct ASH_EXPORT NetworkIconInfo {
27 NetworkIconInfo(); 28 NetworkIconInfo();
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 // Cancels ongoing drive operation. 244 // Cancels ongoing drive operation.
244 virtual void CancelDriveOperation(int32 operation_id) = 0; 245 virtual void CancelDriveOperation(int32 operation_id) = 0;
245 246
246 // Returns information about the ongoing drive operations. 247 // Returns information about the ongoing drive operations.
247 virtual void GetDriveOperationStatusList( 248 virtual void GetDriveOperationStatusList(
248 DriveOperationStatusList* list) = 0; 249 DriveOperationStatusList* list) = 0;
249 250
250 // Shows UI to configure or activate the network specified by |network_id|. 251 // Shows UI to configure or activate the network specified by |network_id|.
251 virtual void ConfigureNetwork(const std::string& network_id) = 0; 252 virtual void ConfigureNetwork(const std::string& network_id) = 0;
252 253
253 // Sends a connect request for the network specified by |network_id|. 254 // Shows UI to enroll the network specified by |network_id| if appropriate,
pneubeck (no reviews) 2013/08/06 15:45:19 here, at ConfigureNetwork and ShowMobileSetup: wha
stevenjb 2013/08/06 20:23:55 Talk to sadrul; I didn't want to rename this every
254 virtual void ConnectToNetwork(const std::string& network_id) = 0; 255 // otherwise behaves the same as ConfigureNetwork.
pneubeck (no reviews) 2013/08/06 15:45:19 what about parent_window == NULL ?
stevenjb 2013/08/06 20:23:55 Added comment.
256 virtual void EnrollOrConfigureNetwork(const std::string& network_id,
257 gfx::NativeWindow parent_window) = 0;
255 258
256 // Shows UI to manage bluetooth devices. 259 // Shows UI to manage bluetooth devices.
257 virtual void ManageBluetoothDevices() = 0; 260 virtual void ManageBluetoothDevices() = 0;
258 261
259 // Toggles bluetooth. 262 // Toggles bluetooth.
260 virtual void ToggleBluetooth() = 0; 263 virtual void ToggleBluetooth() = 0;
261 264
262 // Shows UI to unlock a mobile sim. 265 // Shows UI to unlock a mobile sim.
263 virtual void ShowMobileSimDialog() = 0; 266 virtual void ShowMobileSimDialog() = 0;
264 267
268 // Shows UI to setup a mobile network.
269 virtual void ShowMobileSetup(const std::string& network_id) = 0;
270
265 // Shows UI to connect to an unlisted wifi network. 271 // Shows UI to connect to an unlisted wifi network.
266 virtual void ShowOtherWifi() = 0; 272 virtual void ShowOtherWifi() = 0;
267 273
268 // Shows UI to configure vpn. 274 // Shows UI to configure vpn.
269 virtual void ShowOtherVPN() = 0; 275 virtual void ShowOtherVPN() = 0;
270 276
271 // Shows UI to search for cellular networks. 277 // Shows UI to search for cellular networks.
272 virtual void ShowOtherCellular() = 0; 278 virtual void ShowOtherCellular() = 0;
273 279
274 // Returns whether bluetooth capability is available. 280 // Returns whether bluetooth capability is available.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // Speaks the given text if spoken feedback is enabled. 321 // Speaks the given text if spoken feedback is enabled.
316 virtual void MaybeSpeak(const std::string& utterance) const = 0; 322 virtual void MaybeSpeak(const std::string& utterance) const = 0;
317 323
318 // Creates a dummy delegate for testing. 324 // Creates a dummy delegate for testing.
319 static SystemTrayDelegate* CreateDummyDelegate(); 325 static SystemTrayDelegate* CreateDummyDelegate();
320 }; 326 };
321 327
322 } // namespace ash 328 } // namespace ash
323 329
324 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 330 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698