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

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

Issue 2535723008: Revert "Toggle spoken feedback if two fingers are held down." (Closed)
Patch Set: Don't revert metrics changes 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 AutomationManagerAura::GetInstance()->HandleAlert( 311 AutomationManagerAura::GetInstance()->HandleAlert(
312 profile, l10n_util::GetStringUTF8(msg)); 312 profile, l10n_util::GetStringUTF8(msg));
313 } 313 }
314 } 314 }
315 } 315 }
316 316
317 ash::AccessibilityAlert GetLastAccessibilityAlert() override { 317 ash::AccessibilityAlert GetLastAccessibilityAlert() override {
318 return ash::A11Y_ALERT_NONE; 318 return ash::A11Y_ALERT_NONE;
319 } 319 }
320 320
321 void PlaySpokenFeedbackToggleCountdown(int tick_count) override {
322 DCHECK(AccessibilityManager::Get());
323 AccessibilityManager::Get()->PlaySpokenFeedbackToggleCountdown(tick_count);
324 }
325
326 void PlayEarcon(int sound_key) override { 321 void PlayEarcon(int sound_key) override {
327 DCHECK(AccessibilityManager::Get()); 322 DCHECK(AccessibilityManager::Get());
328 AccessibilityManager::Get()->PlayEarcon( 323 AccessibilityManager::Get()->PlayEarcon(
329 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED); 324 sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
330 } 325 }
331 326
332 base::TimeDelta PlayShutdownSound() const override { 327 base::TimeDelta PlayShutdownSound() const override {
333 return AccessibilityManager::Get()->PlayShutdownSound(); 328 return AccessibilityManager::Get()->PlayShutdownSound();
334 } 329 }
335 330
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 NOTREACHED() << "Unexpected notification " << type; 569 NOTREACHED() << "Unexpected notification " << type;
575 } 570 }
576 } 571 }
577 572
578 void ChromeShellDelegate::PlatformInit() { 573 void ChromeShellDelegate::PlatformInit() {
579 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 574 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
580 content::NotificationService::AllSources()); 575 content::NotificationService::AllSources());
581 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 576 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
582 content::NotificationService::AllSources()); 577 content::NotificationService::AllSources());
583 } 578 }
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