| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 283 |
| 284 virtual bool IsNetworkBehindCaptivePortal( | 284 virtual bool IsNetworkBehindCaptivePortal( |
| 285 const std::string& service_path) const OVERRIDE { | 285 const std::string& service_path) const OVERRIDE { |
| 286 return false; | 286 return false; |
| 287 } | 287 } |
| 288 | 288 |
| 289 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE { | 289 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE { |
| 290 return false; | 290 return false; |
| 291 } | 291 } |
| 292 | 292 |
| 293 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( |
| 294 const std::string& user_id) OVERRIDE { |
| 295 return NULL; |
| 296 } |
| 297 |
| 293 private: | 298 private: |
| 294 ash::SystemTrayNotifier* GetSystemTrayNotifier() { | 299 ash::SystemTrayNotifier* GetSystemTrayNotifier() { |
| 295 return ash::Shell::GetInstance()->system_tray_notifier(); | 300 return ash::Shell::GetInstance()->system_tray_notifier(); |
| 296 } | 301 } |
| 297 | 302 |
| 298 void UpdateClockType() { | 303 void UpdateClockType() { |
| 299 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? | 304 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? |
| 300 base::k24HourClock : base::k12HourClock; | 305 base::k24HourClock : base::k12HourClock; |
| 301 GetSystemTrayNotifier()->NotifyDateFormatChanged(); | 306 GetSystemTrayNotifier()->NotifyDateFormatChanged(); |
| 302 } | 307 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 340 |
| 336 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 341 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 337 }; | 342 }; |
| 338 | 343 |
| 339 } // namespace | 344 } // namespace |
| 340 | 345 |
| 341 | 346 |
| 342 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 347 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 343 return new SystemTrayDelegateWin(); | 348 return new SystemTrayDelegateWin(); |
| 344 } | 349 } |
| OLD | NEW |