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

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

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 #include "ui/gfx/native_widget_types.h"
sky 2014/09/25 19:37:18 And remove this now.
stevenjb 2014/09/25 20:14:36 Done.
19 19
20 namespace base { 20 namespace base {
21 class TimeDelta; 21 class TimeDelta;
22 class TimeTicks; 22 class TimeTicks;
23 } 23 }
24 24
25 namespace ash { 25 namespace ash {
26 26
27 struct ASH_EXPORT NetworkIconInfo { 27 struct ASH_EXPORT NetworkIconInfo {
28 NetworkIconInfo(); 28 NetworkIconInfo();
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) = 0; 228 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) = 0;
229 229
230 // Switches to the selected input method. 230 // Switches to the selected input method.
231 virtual void SwitchIME(const std::string& ime_id) = 0; 231 virtual void SwitchIME(const std::string& ime_id) = 0;
232 232
233 // Activates an IME property. 233 // Activates an IME property.
234 virtual void ActivateIMEProperty(const std::string& key) = 0; 234 virtual void ActivateIMEProperty(const std::string& key) = 0;
235 235
236 // Shows UI to configure or activate the network specified by |network_id|, 236 // Shows UI to configure or activate the network specified by |network_id|,
237 // which may include showing Payment or Portal UI when appropriate. 237 // which may include showing Payment or Portal UI when appropriate.
238 // |parent_window| is used to parent any configuration UI. If NULL a default 238 virtual void ShowNetworkConfigure(const std::string& network_id) = 0;
239 // window will be used.
240 virtual void ShowNetworkConfigure(const std::string& network_id,
241 gfx::NativeWindow parent_window) = 0;
242 239
243 // Shows UI to enroll the network specified by |network_id| if appropriate 240 // Shows UI to enroll the network specified by |network_id| if appropriate
244 // and returns true, otherwise returns false. |parent_window| is used 241 // and returns true, otherwise returns false.
245 // to parent any configuration UI. If NULL a default window will be used. 242 virtual bool EnrollNetwork(const std::string& network_id) = 0;
246 virtual bool EnrollNetwork(const std::string& network_id,
247 gfx::NativeWindow parent_window) = 0;
248 243
249 // Shows UI to manage bluetooth devices. 244 // Shows UI to manage bluetooth devices.
250 virtual void ManageBluetoothDevices() = 0; 245 virtual void ManageBluetoothDevices() = 0;
251 246
252 // Toggles bluetooth. 247 // Toggles bluetooth.
253 virtual void ToggleBluetooth() = 0; 248 virtual void ToggleBluetooth() = 0;
254 249
255 // Shows UI to unlock a mobile sim. 250 // Shows UI to unlock a mobile sim.
256 virtual void ShowMobileSimDialog() = 0; 251 virtual void ShowMobileSimDialog() = 0;
257 252
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 virtual bool IsSearchKeyMappedToCapsLock() = 0; 294 virtual bool IsSearchKeyMappedToCapsLock() = 0;
300 295
301 // Returns accounts delegate for given user. 296 // Returns accounts delegate for given user.
302 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate( 297 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate(
303 const std::string& user_id) = 0; 298 const std::string& user_id) = 0;
304 }; 299 };
305 300
306 } // namespace ash 301 } // namespace ash
307 302
308 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 303 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698