| OLD | NEW |
| 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/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/system/tray/system_tray_notifier.h" | 8 #include "ash/common/system/tray/system_tray_notifier.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 const bool spoken_feedback_enabled = | 115 const bool spoken_feedback_enabled = |
| 116 WmShell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled(); | 116 WmShell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled(); |
| 117 | 117 |
| 118 if (!pass_through_surface && spoken_feedback_enabled && | 118 if (!pass_through_surface && spoken_feedback_enabled && |
| 119 !touch_exploration_controller_.get()) { | 119 !touch_exploration_controller_.get()) { |
| 120 touch_exploration_controller_.reset(new ui::TouchExplorationController( | 120 touch_exploration_controller_.reset(new ui::TouchExplorationController( |
| 121 root_window_controller_->GetRootWindow(), this)); | 121 root_window_controller_->GetRootWindow(), this)); |
| 122 } else if (!spoken_feedback_enabled || pass_through_surface) { | 122 } else if (!spoken_feedback_enabled || pass_through_surface) { |
| 123 touch_exploration_controller_.reset(); | 123 touch_exploration_controller_.reset(); |
| 124 if (spoken_feedback_enabled) { |
| 125 SilenceSpokenFeedback(); |
| 126 WmShell::Get()->accessibility_delegate()->ClearFocusHighlight(); |
| 127 } |
| 124 } | 128 } |
| 125 } | 129 } |
| 126 | 130 |
| 127 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { | 131 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { |
| 128 return !base::CommandLine::ForCurrentProcess()->HasSwitch( | 132 return !base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 129 chromeos::switches::kDisableVolumeAdjustSound); | 133 chromeos::switches::kDisableVolumeAdjustSound); |
| 130 } | 134 } |
| 131 | 135 |
| 132 } // namespace ash | 136 } // namespace ash |
| OLD | NEW |