| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_linux.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_linux.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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 virtual void ShowChromeSlow() OVERRIDE { | 116 virtual void ShowChromeSlow() OVERRIDE { |
| 117 chrome::ScopedTabbedBrowserDisplayer displayer( | 117 chrome::ScopedTabbedBrowserDisplayer displayer( |
| 118 ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); | 118 ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); |
| 119 chrome::ShowSlow(displayer.browser()); | 119 chrome::ShowSlow(displayer.browser()); |
| 120 } | 120 } |
| 121 | 121 |
| 122 virtual bool ShouldShowDisplayNotification() OVERRIDE { | 122 virtual bool ShouldShowDisplayNotification() OVERRIDE { |
| 123 return false; | 123 return false; |
| 124 } | 124 } |
| 125 | 125 |
| 126 virtual void ShowDriveSettings() OVERRIDE { | |
| 127 } | |
| 128 | |
| 129 virtual void ShowIMESettings() OVERRIDE { | 126 virtual void ShowIMESettings() OVERRIDE { |
| 130 } | 127 } |
| 131 | 128 |
| 132 virtual void ShowHelp() OVERRIDE { | 129 virtual void ShowHelp() OVERRIDE { |
| 133 chrome::ShowHelpForProfile( | 130 chrome::ShowHelpForProfile( |
| 134 ProfileManager::GetLastUsedProfile(), | 131 ProfileManager::GetLastUsedProfile(), |
| 135 chrome::HOST_DESKTOP_TYPE_ASH, | 132 chrome::HOST_DESKTOP_TYPE_ASH, |
| 136 chrome::HELP_SOURCE_MENU); | 133 chrome::HELP_SOURCE_MENU); |
| 137 } | 134 } |
| 138 | 135 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 virtual void GetCurrentIMEProperties( | 202 virtual void GetCurrentIMEProperties( |
| 206 ash::IMEPropertyInfoList* list) OVERRIDE { | 203 ash::IMEPropertyInfoList* list) OVERRIDE { |
| 207 } | 204 } |
| 208 | 205 |
| 209 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 206 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 210 } | 207 } |
| 211 | 208 |
| 212 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { | 209 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 213 } | 210 } |
| 214 | 211 |
| 215 virtual void CancelDriveOperation(int32 operation_id) OVERRIDE { | |
| 216 } | |
| 217 | |
| 218 virtual void GetDriveOperationStatusList( | |
| 219 ash::DriveOperationStatusList* list) OVERRIDE { | |
| 220 } | |
| 221 | |
| 222 virtual void ShowNetworkConfigure(const std::string& network_id, | 212 virtual void ShowNetworkConfigure(const std::string& network_id, |
| 223 gfx::NativeWindow parent_window) OVERRIDE { | 213 gfx::NativeWindow parent_window) OVERRIDE { |
| 224 } | 214 } |
| 225 | 215 |
| 226 virtual bool EnrollNetwork(const std::string& network_id, | 216 virtual bool EnrollNetwork(const std::string& network_id, |
| 227 gfx::NativeWindow parent_window) OVERRIDE { | 217 gfx::NativeWindow parent_window) OVERRIDE { |
| 228 return true; | 218 return true; |
| 229 } | 219 } |
| 230 | 220 |
| 231 virtual void ManageBluetoothDevices() OVERRIDE { | 221 virtual void ManageBluetoothDevices() OVERRIDE { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 | 331 |
| 342 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); | 332 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); |
| 343 }; | 333 }; |
| 344 | 334 |
| 345 } // namespace | 335 } // namespace |
| 346 | 336 |
| 347 | 337 |
| 348 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { | 338 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { |
| 349 return new SystemTrayDelegateLinux(); | 339 return new SystemTrayDelegateLinux(); |
| 350 } | 340 } |
| OLD | NEW |