| 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 | 277 |
| 278 virtual bool IsSearchKeyMappedToCapsLock() override { | 278 virtual bool IsSearchKeyMappedToCapsLock() override { |
| 279 return false; | 279 return false; |
| 280 } | 280 } |
| 281 | 281 |
| 282 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( | 282 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( |
| 283 const std::string& user_id) override { | 283 const std::string& user_id) override { |
| 284 return NULL; | 284 return NULL; |
| 285 } | 285 } |
| 286 | 286 |
| 287 virtual void AddCustodianInfoTrayObserver( |
| 288 ash::CustodianInfoTrayObserver* observer) override { |
| 289 } |
| 290 |
| 291 virtual void RemoveCustodianInfoTrayObserver( |
| 292 ash::CustodianInfoTrayObserver* observer) override { |
| 293 } |
| 294 |
| 287 private: | 295 private: |
| 288 ash::SystemTrayNotifier* GetSystemTrayNotifier() { | 296 ash::SystemTrayNotifier* GetSystemTrayNotifier() { |
| 289 return ash::Shell::GetInstance()->system_tray_notifier(); | 297 return ash::Shell::GetInstance()->system_tray_notifier(); |
| 290 } | 298 } |
| 291 | 299 |
| 292 void UpdateClockType() { | 300 void UpdateClockType() { |
| 293 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? | 301 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? |
| 294 base::k24HourClock : base::k12HourClock; | 302 base::k24HourClock : base::k12HourClock; |
| 295 GetSystemTrayNotifier()->NotifyDateFormatChanged(); | 303 GetSystemTrayNotifier()->NotifyDateFormatChanged(); |
| 296 } | 304 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 313 | 321 |
| 314 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 322 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 315 }; | 323 }; |
| 316 | 324 |
| 317 } // namespace | 325 } // namespace |
| 318 | 326 |
| 319 | 327 |
| 320 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 328 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 321 return new SystemTrayDelegateWin(); | 329 return new SystemTrayDelegateWin(); |
| 322 } | 330 } |
| OLD | NEW |