| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/accessibility_delegate.h" | 9 #include "ash/accessibility_delegate.h" |
| 10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_finder.h" | 27 #include "chrome/browser/ui/browser_finder.h" |
| 28 #include "chrome/browser/ui/browser_list.h" | 28 #include "chrome/browser/ui/browser_list.h" |
| 29 #include "chrome/browser/ui/browser_tabstrip.h" | 29 #include "chrome/browser/ui/browser_tabstrip.h" |
| 30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
| 31 #include "chrome/browser/ui/host_desktop.h" | 31 #include "chrome/browser/ui/host_desktop.h" |
| 32 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 32 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 33 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 33 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 34 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 35 #include "content/public/browser/notification_service.h" | 35 #include "content/public/browser/notification_service.h" |
| 36 #include "media/audio/sounds/sounds_manager.h" |
| 36 | 37 |
| 37 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 38 #include "chrome/browser/ui/ash/system_tray_delegate_win.h" | 39 #include "chrome/browser/ui/ash/system_tray_delegate_win.h" |
| 39 #endif | 40 #endif |
| 40 | 41 |
| 41 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 42 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 42 #include "chrome/browser/ui/ash/system_tray_delegate_linux.h" | 43 #include "chrome/browser/ui/ash/system_tray_delegate_linux.h" |
| 43 #endif | 44 #endif |
| 44 | 45 |
| 45 namespace { | 46 namespace { |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 147 } |
| 147 | 148 |
| 148 virtual void TriggerAccessibilityAlert( | 149 virtual void TriggerAccessibilityAlert( |
| 149 ash::AccessibilityAlert alert) OVERRIDE { | 150 ash::AccessibilityAlert alert) OVERRIDE { |
| 150 } | 151 } |
| 151 | 152 |
| 152 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE { | 153 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE { |
| 153 return ash::A11Y_ALERT_NONE; | 154 return ash::A11Y_ALERT_NONE; |
| 154 } | 155 } |
| 155 | 156 |
| 157 virtual void PlayEarcon(media::SoundsManager::SoundKey sound_key) OVERRIDE { |
| 158 } |
| 159 |
| 156 virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { | 160 virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { |
| 157 return base::TimeDelta(); | 161 return base::TimeDelta(); |
| 158 } | 162 } |
| 159 | 163 |
| 160 private: | 164 private: |
| 161 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate); | 165 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate); |
| 162 }; | 166 }; |
| 163 | 167 |
| 164 } // namespace | 168 } // namespace |
| 165 | 169 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 chrome::NOTIFICATION_PROFILE_ADDED, | 285 chrome::NOTIFICATION_PROFILE_ADDED, |
| 282 content::NotificationService::AllSources()); | 286 content::NotificationService::AllSources()); |
| 283 registrar_.Add(this, | 287 registrar_.Add(this, |
| 284 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 288 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
| 285 content::NotificationService::AllSources()); | 289 content::NotificationService::AllSources()); |
| 286 registrar_.Add(this, | 290 registrar_.Add(this, |
| 287 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 291 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
| 288 content::NotificationService::AllSources()); | 292 content::NotificationService::AllSources()); |
| 289 #endif | 293 #endif |
| 290 } | 294 } |
| OLD | NEW |