OLD | NEW |
---|---|
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 <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ime/input_method_menu_manager.h" | 10 #include "ash/ime/input_method_menu_manager.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 public SupervisedUserServiceObserver { | 60 public SupervisedUserServiceObserver { |
61 public: | 61 public: |
62 SystemTrayDelegateChromeOS(); | 62 SystemTrayDelegateChromeOS(); |
63 | 63 |
64 virtual ~SystemTrayDelegateChromeOS(); | 64 virtual ~SystemTrayDelegateChromeOS(); |
65 | 65 |
66 void InitializeOnAdapterReady( | 66 void InitializeOnAdapterReady( |
67 scoped_refptr<device::BluetoothAdapter> adapter); | 67 scoped_refptr<device::BluetoothAdapter> adapter); |
68 | 68 |
69 // Overridden from ash::SystemTrayDelegate: | 69 // Overridden from ash::SystemTrayDelegate: |
70 virtual void Initialize() override; | 70 virtual void Initialize() override; |
oshima
2014/10/24 23:14:20
not sure why this wasn't convered in https://coder
stevenjb
2014/10/27 16:25:01
I'll go ahead and fix it here, I personally prefer
| |
71 virtual void Shutdown() override; | 71 virtual void Shutdown() override; |
72 virtual bool GetTrayVisibilityOnStartup() override; | 72 virtual bool GetTrayVisibilityOnStartup() override; |
73 virtual ash::user::LoginStatus GetUserLoginStatus() const override; | 73 virtual ash::user::LoginStatus GetUserLoginStatus() const override; |
74 virtual void ChangeProfilePicture() override; | 74 virtual void ChangeProfilePicture() override; |
75 virtual const std::string GetEnterpriseDomain() const override; | 75 virtual const std::string GetEnterpriseDomain() const override; |
76 virtual const base::string16 GetEnterpriseMessage() const override; | 76 virtual const base::string16 GetEnterpriseMessage() const override; |
77 virtual const std::string GetSupervisedUserManager() const override; | 77 virtual const std::string GetSupervisedUserManager() const override; |
78 virtual const base::string16 GetSupervisedUserManagerName() const override; | 78 virtual const base::string16 GetSupervisedUserManagerName() const override; |
79 virtual const base::string16 GetSupervisedUserMessage() const override; | 79 virtual const base::string16 GetSupervisedUserMessage() const override; |
80 virtual bool IsUserSupervised() const override; | 80 virtual bool IsUserSupervised() const override; |
(...skipping 27 matching lines...) Expand all Loading... | |
108 override; | 108 override; |
109 virtual void BluetoothStartDiscovering() override; | 109 virtual void BluetoothStartDiscovering() override; |
110 virtual void BluetoothStopDiscovering() override; | 110 virtual void BluetoothStopDiscovering() override; |
111 virtual void ConnectToBluetoothDevice(const std::string& address) override; | 111 virtual void ConnectToBluetoothDevice(const std::string& address) override; |
112 virtual bool IsBluetoothDiscovering() override; | 112 virtual bool IsBluetoothDiscovering() override; |
113 virtual void GetCurrentIME(ash::IMEInfo* info) override; | 113 virtual void GetCurrentIME(ash::IMEInfo* info) override; |
114 virtual void GetAvailableIMEList(ash::IMEInfoList* list) override; | 114 virtual void GetAvailableIMEList(ash::IMEInfoList* list) override; |
115 virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; | 115 virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; |
116 virtual void SwitchIME(const std::string& ime_id) override; | 116 virtual void SwitchIME(const std::string& ime_id) override; |
117 virtual void ActivateIMEProperty(const std::string& key) override; | 117 virtual void ActivateIMEProperty(const std::string& key) override; |
118 virtual void ShowNetworkConfigure(const std::string& network_id) override; | |
119 virtual bool EnrollNetwork(const std::string& network_id) override; | |
120 virtual void ManageBluetoothDevices() override; | 118 virtual void ManageBluetoothDevices() override; |
121 virtual void ToggleBluetooth() override; | 119 virtual void ToggleBluetooth() override; |
122 virtual void ShowMobileSimDialog() override; | |
123 virtual void ShowMobileSetupDialog(const std::string& service_path) override; | |
124 virtual void ShowOtherNetworkDialog(const std::string& type) override; | 120 virtual void ShowOtherNetworkDialog(const std::string& type) override; |
125 virtual bool GetBluetoothAvailable() override; | 121 virtual bool GetBluetoothAvailable() override; |
126 virtual bool GetBluetoothEnabled() override; | 122 virtual bool GetBluetoothEnabled() override; |
127 virtual bool GetBluetoothDiscovering() override; | 123 virtual bool GetBluetoothDiscovering() override; |
128 virtual void ChangeProxySettings() override; | 124 virtual void ChangeProxySettings() override; |
129 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; | 125 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; |
130 virtual void SetVolumeControlDelegate( | 126 virtual void SetVolumeControlDelegate( |
131 scoped_ptr<ash::VolumeControlDelegate> delegate) override; | 127 scoped_ptr<ash::VolumeControlDelegate> delegate) override; |
132 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time) | 128 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time) |
133 override; | 129 override; |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
290 | 286 |
291 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 287 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
292 | 288 |
293 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 289 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
294 }; | 290 }; |
295 | 291 |
296 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 292 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
297 | 293 |
298 } // namespace chromeos | 294 } // namespace chromeos |
299 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 295 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
OLD | NEW |