Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2540333004: Merge to M56: Revert "Toggle spoken feedback if two fingers are held down." (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 AutomationManagerAura::GetInstance()->HandleAlert( 305 AutomationManagerAura::GetInstance()->HandleAlert(
306 profile, l10n_util::GetStringUTF8(msg)); 306 profile, l10n_util::GetStringUTF8(msg));
307 } 307 }
308 } 308 }
309 } 309 }
310 310
311 ash::AccessibilityAlert GetLastAccessibilityAlert() override { 311 ash::AccessibilityAlert GetLastAccessibilityAlert() override {
312 return ash::A11Y_ALERT_NONE; 312 return ash::A11Y_ALERT_NONE;
313 } 313 }
314 314
315 void PlaySpokenFeedbackToggleCountdown(int tick_count) override {
316 DCHECK(AccessibilityManager::Get());
317 AccessibilityManager::Get()->PlaySpokenFeedbackToggleCountdown(tick_count);
318 }
319
320 void PlayEarcon(int sound_key) override { 315 void PlayEarcon(int sound_key) override {
321 DCHECK(AccessibilityManager::Get()); 316 DCHECK(AccessibilityManager::Get());
322 AccessibilityManager::Get()->PlayEarcon( 317 AccessibilityManager::Get()->PlayEarcon(
323 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED); 318 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
324 } 319 }
325 320
326 base::TimeDelta PlayShutdownSound() const override { 321 base::TimeDelta PlayShutdownSound() const override {
327 return AccessibilityManager::Get()->PlayShutdownSound(); 322 return AccessibilityManager::Get()->PlayShutdownSound();
328 } 323 }
329 324
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 NOTREACHED() << "Unexpected notification " << type; 563 NOTREACHED() << "Unexpected notification " << type;
569 } 564 }
570 } 565 }
571 566
572 void ChromeShellDelegate::PlatformInit() { 567 void ChromeShellDelegate::PlatformInit() {
573 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 568 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
574 content::NotificationService::AllSources()); 569 content::NotificationService::AllSources());
575 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 570 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
576 content::NotificationService::AllSources()); 571 content::NotificationService::AllSources());
577 } 572 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/sounds/spoken_feedback_toggle_countdown_low.wav ('k') | chromeos/audio/chromeos_sounds.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698