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

Side by Side Diff: ash/ash_touch_exploration_manager_chromeos.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.h ('k') | ash/default_accessibility_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/ash_touch_exploration_manager_chromeos.h" 5 #include "ash/ash_touch_exploration_manager_chromeos.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/audio/sounds.h" 8 #include "ash/audio/sounds.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 27
28 AshTouchExplorationManager::~AshTouchExplorationManager() { 28 AshTouchExplorationManager::~AshTouchExplorationManager() {
29 SystemTrayNotifier* system_tray_notifier = 29 SystemTrayNotifier* system_tray_notifier =
30 Shell::GetInstance()->system_tray_notifier(); 30 Shell::GetInstance()->system_tray_notifier();
31 if (system_tray_notifier) 31 if (system_tray_notifier)
32 system_tray_notifier->RemoveAccessibilityObserver(this); 32 system_tray_notifier->RemoveAccessibilityObserver(this);
33 } 33 }
34 34
35 void AshTouchExplorationManager::OnAccessibilityModeChanged( 35 void AshTouchExplorationManager::OnAccessibilityModeChanged(
36 AccessibilityNotificationVisibility notify) { 36 ui::AccessibilityNotificationVisibility notify) {
37 UpdateTouchExplorationState(); 37 UpdateTouchExplorationState();
38 } 38 }
39 39
40 void AshTouchExplorationManager::SetOutputLevel(int volume) { 40 void AshTouchExplorationManager::SetOutputLevel(int volume) {
41 if (volume > 0) { 41 if (volume > 0) {
42 if (audio_handler_->IsOutputMuted()) { 42 if (audio_handler_->IsOutputMuted()) {
43 audio_handler_->SetOutputMute(false); 43 audio_handler_->SetOutputMute(false);
44 } 44 }
45 } 45 }
46 audio_handler_->SetOutputVolumePercent(volume); 46 audio_handler_->SetOutputVolumePercent(volume);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 touch_exploration_controller_.reset(); 92 touch_exploration_controller_.reset();
93 } 93 }
94 } 94 }
95 95
96 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { 96 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
97 return !base::CommandLine::ForCurrentProcess()->HasSwitch( 97 return !base::CommandLine::ForCurrentProcess()->HasSwitch(
98 chromeos::switches::kDisableVolumeAdjustSound); 98 chromeos::switches::kDisableVolumeAdjustSound);
99 } 99 }
100 100
101 } // namespace ash 101 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.h ('k') | ash/default_accessibility_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698