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

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

Issue 2584063002: Re-land: Toggle spoken feedback if two fingers are held down. (Closed)
Patch Set: Only toggle spoken feedback on CFM devices 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 AutomationManagerAura::GetInstance()->HandleAlert( 310 AutomationManagerAura::GetInstance()->HandleAlert(
311 profile, l10n_util::GetStringUTF8(msg)); 311 profile, l10n_util::GetStringUTF8(msg));
312 } 312 }
313 } 313 }
314 } 314 }
315 315
316 ash::AccessibilityAlert GetLastAccessibilityAlert() override { 316 ash::AccessibilityAlert GetLastAccessibilityAlert() override {
317 return ash::A11Y_ALERT_NONE; 317 return ash::A11Y_ALERT_NONE;
318 } 318 }
319 319
320 bool ShouldToggleSpokenFeedbackViaTouch() override {
321 DCHECK(AccessibilityManager::Get());
322 return AccessibilityManager::Get()->ShouldToggleSpokenFeedbackViaTouch();
323 }
324
325 void PlaySpokenFeedbackToggleCountdown(int tick_count) override {
326 DCHECK(AccessibilityManager::Get());
327 AccessibilityManager::Get()->PlaySpokenFeedbackToggleCountdown(tick_count);
328 }
329
320 void PlayEarcon(int sound_key) override { 330 void PlayEarcon(int sound_key) override {
321 DCHECK(AccessibilityManager::Get()); 331 DCHECK(AccessibilityManager::Get());
322 AccessibilityManager::Get()->PlayEarcon( 332 AccessibilityManager::Get()->PlayEarcon(
323 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED); 333 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
324 } 334 }
325 335
326 base::TimeDelta PlayShutdownSound() const override { 336 base::TimeDelta PlayShutdownSound() const override {
327 return AccessibilityManager::Get()->PlayShutdownSound(); 337 return AccessibilityManager::Get()->PlayShutdownSound();
328 } 338 }
329 339
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 NOTREACHED() << "Unexpected notification " << type; 587 NOTREACHED() << "Unexpected notification " << type;
578 } 588 }
579 } 589 }
580 590
581 void ChromeShellDelegate::PlatformInit() { 591 void ChromeShellDelegate::PlatformInit() {
582 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 592 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
583 content::NotificationService::AllSources()); 593 content::NotificationService::AllSources());
584 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 594 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
585 content::NotificationService::AllSources()); 595 content::NotificationService::AllSources());
586 } 596 }
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