| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 virtual void GetCurrentIMEProperties( | 203 virtual void GetCurrentIMEProperties( |
| 204 ash::IMEPropertyInfoList* list) OVERRIDE { | 204 ash::IMEPropertyInfoList* list) OVERRIDE { |
| 205 } | 205 } |
| 206 | 206 |
| 207 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 207 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 208 } | 208 } |
| 209 | 209 |
| 210 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { | 210 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 211 } | 211 } |
| 212 | 212 |
| 213 virtual void ShowNetworkConfigure(const std::string& network_id, | 213 virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE { |
| 214 gfx::NativeWindow parent_window) OVERRIDE { | |
| 215 } | 214 } |
| 216 | 215 |
| 217 virtual bool EnrollNetwork(const std::string& network_id, | 216 virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE { |
| 218 gfx::NativeWindow parent_window) OVERRIDE { | |
| 219 return true; | 217 return true; |
| 220 } | 218 } |
| 221 | 219 |
| 222 virtual void ManageBluetoothDevices() OVERRIDE { | 220 virtual void ManageBluetoothDevices() OVERRIDE { |
| 223 } | 221 } |
| 224 | 222 |
| 225 virtual void ToggleBluetooth() OVERRIDE { | 223 virtual void ToggleBluetooth() OVERRIDE { |
| 226 } | 224 } |
| 227 | 225 |
| 228 virtual void ShowMobileSimDialog() OVERRIDE { | 226 virtual void ShowMobileSimDialog() OVERRIDE { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 330 |
| 333 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 331 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 334 }; | 332 }; |
| 335 | 333 |
| 336 } // namespace | 334 } // namespace |
| 337 | 335 |
| 338 | 336 |
| 339 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 337 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 340 return new SystemTrayDelegateWin(); | 338 return new SystemTrayDelegateWin(); |
| 341 } | 339 } |
| OLD | NEW |