| OLD | NEW |
| 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 #include "chrome/browser/ui/ash/system_tray_delegate_win.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 virtual void ShowDisplaySettings() OVERRIDE { | 114 virtual void ShowDisplaySettings() OVERRIDE { |
| 115 } | 115 } |
| 116 | 116 |
| 117 virtual void ShowChromeSlow() OVERRIDE { | 117 virtual void ShowChromeSlow() OVERRIDE { |
| 118 } | 118 } |
| 119 | 119 |
| 120 virtual bool ShouldShowDisplayNotification() OVERRIDE { | 120 virtual bool ShouldShowDisplayNotification() OVERRIDE { |
| 121 return false; | 121 return false; |
| 122 } | 122 } |
| 123 | 123 |
| 124 virtual void ShowDriveSettings() OVERRIDE { | |
| 125 } | |
| 126 | |
| 127 virtual void ShowIMESettings() OVERRIDE { | 124 virtual void ShowIMESettings() OVERRIDE { |
| 128 } | 125 } |
| 129 | 126 |
| 130 virtual void ShowHelp() OVERRIDE { | 127 virtual void ShowHelp() OVERRIDE { |
| 131 chrome::ShowHelpForProfile( | 128 chrome::ShowHelpForProfile( |
| 132 ProfileManager::GetLastUsedProfile(), | 129 ProfileManager::GetLastUsedProfile(), |
| 133 chrome::HOST_DESKTOP_TYPE_ASH, | 130 chrome::HOST_DESKTOP_TYPE_ASH, |
| 134 chrome::HELP_SOURCE_MENU); | 131 chrome::HELP_SOURCE_MENU); |
| 135 } | 132 } |
| 136 | 133 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 virtual void GetCurrentIMEProperties( | 200 virtual void GetCurrentIMEProperties( |
| 204 ash::IMEPropertyInfoList* list) OVERRIDE { | 201 ash::IMEPropertyInfoList* list) OVERRIDE { |
| 205 } | 202 } |
| 206 | 203 |
| 207 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 204 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 208 } | 205 } |
| 209 | 206 |
| 210 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { | 207 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 211 } | 208 } |
| 212 | 209 |
| 213 virtual void CancelDriveOperation(int32 operation_id) OVERRIDE { | |
| 214 } | |
| 215 | |
| 216 virtual void GetDriveOperationStatusList( | |
| 217 ash::DriveOperationStatusList* list) OVERRIDE { | |
| 218 } | |
| 219 | |
| 220 virtual void ShowNetworkConfigure(const std::string& network_id, | 210 virtual void ShowNetworkConfigure(const std::string& network_id, |
| 221 gfx::NativeWindow parent_window) OVERRIDE { | 211 gfx::NativeWindow parent_window) OVERRIDE { |
| 222 } | 212 } |
| 223 | 213 |
| 224 virtual bool EnrollNetwork(const std::string& network_id, | 214 virtual bool EnrollNetwork(const std::string& network_id, |
| 225 gfx::NativeWindow parent_window) OVERRIDE { | 215 gfx::NativeWindow parent_window) OVERRIDE { |
| 226 return true; | 216 return true; |
| 227 } | 217 } |
| 228 | 218 |
| 229 virtual void ManageBluetoothDevices() OVERRIDE { | 219 virtual void ManageBluetoothDevices() OVERRIDE { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 | 329 |
| 340 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 330 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 341 }; | 331 }; |
| 342 | 332 |
| 343 } // namespace | 333 } // namespace |
| 344 | 334 |
| 345 | 335 |
| 346 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 336 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 347 return new SystemTrayDelegateWin(); | 337 return new SystemTrayDelegateWin(); |
| 348 } | 338 } |
| OLD | NEW |