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