| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 146 } |
| 147 | 147 |
| 148 virtual void TriggerAccessibilityAlert( | 148 virtual void TriggerAccessibilityAlert( |
| 149 ash::AccessibilityAlert alert) OVERRIDE { | 149 ash::AccessibilityAlert alert) OVERRIDE { |
| 150 } | 150 } |
| 151 | 151 |
| 152 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE { | 152 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE { |
| 153 return ash::A11Y_ALERT_NONE; | 153 return ash::A11Y_ALERT_NONE; |
| 154 } | 154 } |
| 155 | 155 |
| 156 virtual void PlayEarcon(int sound_key) OVERRIDE { |
| 157 } |
| 158 |
| 156 virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { | 159 virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { |
| 157 return base::TimeDelta(); | 160 return base::TimeDelta(); |
| 158 } | 161 } |
| 159 | 162 |
| 160 private: | 163 private: |
| 161 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate); | 164 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate); |
| 162 }; | 165 }; |
| 163 | 166 |
| 164 } // namespace | 167 } // namespace |
| 165 | 168 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 chrome::NOTIFICATION_PROFILE_ADDED, | 284 chrome::NOTIFICATION_PROFILE_ADDED, |
| 282 content::NotificationService::AllSources()); | 285 content::NotificationService::AllSources()); |
| 283 registrar_.Add(this, | 286 registrar_.Add(this, |
| 284 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 287 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
| 285 content::NotificationService::AllSources()); | 288 content::NotificationService::AllSources()); |
| 286 registrar_.Add(this, | 289 registrar_.Add(this, |
| 287 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 290 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
| 288 content::NotificationService::AllSources()); | 291 content::NotificationService::AllSources()); |
| 289 #endif | 292 #endif |
| 290 } | 293 } |
| OLD | NEW |