| 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" |
| 11 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
| 12 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
| 13 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
| 14 #include "ash/volume_control_delegate.h" | 14 #include "ash/volume_control_delegate.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/lifetime/application_lifetime.h" | 18 #include "chrome/browser/lifetime/application_lifetime.h" |
| 19 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
| 20 #include "chrome/browser/ui/chrome_pages.h" | 20 #include "chrome/browser/ui/chrome_pages.h" |
| 21 #include "chrome/browser/ui/host_desktop.h" | 21 #include "chrome/browser/ui/host_desktop.h" |
| 22 #include "chrome/browser/upgrade_detector.h" | 22 #include "chrome/browser/upgrade_detector.h" |
| 23 #include "chrome/grit/locale_settings.h" |
| 23 #include "content/public/browser/notification_observer.h" | 24 #include "content/public/browser/notification_observer.h" |
| 24 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
| 25 | |
| 26 #include "grit/locale_settings.h" | |
| 27 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 28 | 27 |
| 29 namespace { | 28 namespace { |
| 30 | 29 |
| 31 class SystemTrayDelegateWin : public ash::SystemTrayDelegate, | 30 class SystemTrayDelegateWin : public ash::SystemTrayDelegate, |
| 32 public content::NotificationObserver { | 31 public content::NotificationObserver { |
| 33 public: | 32 public: |
| 34 SystemTrayDelegateWin() | 33 SystemTrayDelegateWin() |
| 35 : clock_type_(base::GetHourClockType()) { | 34 : clock_type_(base::GetHourClockType()) { |
| 36 // Register notifications on construction so that events such as | 35 // Register notifications on construction so that events such as |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 | 328 |
| 330 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 329 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
| 331 }; | 330 }; |
| 332 | 331 |
| 333 } // namespace | 332 } // namespace |
| 334 | 333 |
| 335 | 334 |
| 336 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 335 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
| 337 return new SystemTrayDelegateWin(); | 336 return new SystemTrayDelegateWin(); |
| 338 } | 337 } |
| OLD | NEW |