| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 virtual bool GetSessionLengthLimit( | 266 virtual bool GetSessionLengthLimit( |
| 267 base::TimeDelta* session_length_limit) OVERRIDE { | 267 base::TimeDelta* session_length_limit) OVERRIDE { |
| 268 return false; | 268 return false; |
| 269 } | 269 } |
| 270 | 270 |
| 271 virtual int GetSystemTrayMenuWidth() OVERRIDE { | 271 virtual int GetSystemTrayMenuWidth() OVERRIDE { |
| 272 return l10n_util::GetLocalizedContentsWidthInPixels( | 272 return l10n_util::GetLocalizedContentsWidthInPixels( |
| 273 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS); | 273 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS); |
| 274 } | 274 } |
| 275 | 275 |
| 276 virtual void ActiveUserWasChanged() OVERRIDE { |
| 277 } |
| 278 |
| 276 private: | 279 private: |
| 277 ash::SystemTrayNotifier* GetSystemTrayNotifier() { | 280 ash::SystemTrayNotifier* GetSystemTrayNotifier() { |
| 278 return ash::Shell::GetInstance()->system_tray_notifier(); | 281 return ash::Shell::GetInstance()->system_tray_notifier(); |
| 279 } | 282 } |
| 280 | 283 |
| 281 void UpdateClockType() { | 284 void UpdateClockType() { |
| 282 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? | 285 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? |
| 283 base::k24HourClock : base::k12HourClock; | 286 base::k24HourClock : base::k12HourClock; |
| 284 GetSystemTrayNotifier()->NotifyDateFormatChanged(); | 287 GetSystemTrayNotifier()->NotifyDateFormatChanged(); |
| 285 } | 288 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 | 321 |
| 319 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 322 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 320 }; | 323 }; |
| 321 | 324 |
| 322 } // namespace | 325 } // namespace |
| 323 | 326 |
| 324 | 327 |
| 325 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 328 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 326 return new SystemTrayDelegateWin(); | 329 return new SystemTrayDelegateWin(); |
| 327 } | 330 } |
| OLD | NEW |