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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Elim includes 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
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include "ash/ime/input_method_menu_manager.h" 8 #include "ash/ime/input_method_menu_manager.h"
9 #include "ash/session/session_state_observer.h" 9 #include "ash/session/session_state_observer.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 OVERRIDE; 96 OVERRIDE;
97 virtual void BluetoothStartDiscovering() OVERRIDE; 97 virtual void BluetoothStartDiscovering() OVERRIDE;
98 virtual void BluetoothStopDiscovering() OVERRIDE; 98 virtual void BluetoothStopDiscovering() OVERRIDE;
99 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE; 99 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;
100 virtual bool IsBluetoothDiscovering() OVERRIDE; 100 virtual bool IsBluetoothDiscovering() OVERRIDE;
101 virtual void GetCurrentIME(ash::IMEInfo* info) OVERRIDE; 101 virtual void GetCurrentIME(ash::IMEInfo* info) OVERRIDE;
102 virtual void GetAvailableIMEList(ash::IMEInfoList* list) OVERRIDE; 102 virtual void GetAvailableIMEList(ash::IMEInfoList* list) OVERRIDE;
103 virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) OVERRIDE; 103 virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) OVERRIDE;
104 virtual void SwitchIME(const std::string& ime_id) OVERRIDE; 104 virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
105 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; 105 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
106 virtual void ShowNetworkConfigure(const std::string& network_id, 106 virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
107 gfx::NativeWindow parent_window) OVERRIDE; 107 virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
108 virtual bool EnrollNetwork(const std::string& network_id,
109 gfx::NativeWindow parent_window) OVERRIDE;
110 virtual void ManageBluetoothDevices() OVERRIDE; 108 virtual void ManageBluetoothDevices() OVERRIDE;
111 virtual void ToggleBluetooth() OVERRIDE; 109 virtual void ToggleBluetooth() OVERRIDE;
112 virtual void ShowMobileSimDialog() OVERRIDE; 110 virtual void ShowMobileSimDialog() OVERRIDE;
113 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; 111 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
114 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; 112 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
115 virtual bool GetBluetoothAvailable() OVERRIDE; 113 virtual bool GetBluetoothAvailable() OVERRIDE;
116 virtual bool GetBluetoothEnabled() OVERRIDE; 114 virtual bool GetBluetoothEnabled() OVERRIDE;
117 virtual bool GetBluetoothDiscovering() OVERRIDE; 115 virtual bool GetBluetoothDiscovering() OVERRIDE;
118 virtual void ChangeProxySettings() OVERRIDE; 116 virtual void ChangeProxySettings() OVERRIDE;
119 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE; 117 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 258
261 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 259 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
262 260
263 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 261 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
264 }; 262 };
265 263
266 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 264 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
267 265
268 } // namespace chromeos 266 } // namespace chromeos
269 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 267 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698