| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 | 279 |
| 280 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE { | 280 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE { |
| 281 return false; | 281 return false; |
| 282 } | 282 } |
| 283 | 283 |
| 284 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( | 284 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( |
| 285 const std::string& user_id) OVERRIDE { | 285 const std::string& user_id) OVERRIDE { |
| 286 return NULL; | 286 return NULL; |
| 287 } | 287 } |
| 288 | 288 |
| 289 virtual void AddCustodianInfoChangedCallback( |
| 290 const base::Closure& /*callback*/) OVERRIDE { |
| 291 } |
| 292 |
| 289 private: | 293 private: |
| 290 ash::SystemTrayNotifier* GetSystemTrayNotifier() { | 294 ash::SystemTrayNotifier* GetSystemTrayNotifier() { |
| 291 return ash::Shell::GetInstance()->system_tray_notifier(); | 295 return ash::Shell::GetInstance()->system_tray_notifier(); |
| 292 } | 296 } |
| 293 | 297 |
| 294 void UpdateClockType() { | 298 void UpdateClockType() { |
| 295 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? | 299 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? |
| 296 base::k24HourClock : base::k12HourClock; | 300 base::k24HourClock : base::k12HourClock; |
| 297 GetSystemTrayNotifier()->NotifyDateFormatChanged(); | 301 GetSystemTrayNotifier()->NotifyDateFormatChanged(); |
| 298 } | 302 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 | 337 |
| 334 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); | 338 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); |
| 335 }; | 339 }; |
| 336 | 340 |
| 337 } // namespace | 341 } // namespace |
| 338 | 342 |
| 339 | 343 |
| 340 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { | 344 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { |
| 341 return new SystemTrayDelegateLinux(); | 345 return new SystemTrayDelegateLinux(); |
| 342 } | 346 } |
| OLD | NEW |