| 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/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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 87 |
| 88 if (enabled && !touch_exploration_controller_.get()) { | 88 if (enabled && !touch_exploration_controller_.get()) { |
| 89 touch_exploration_controller_.reset(new ui::TouchExplorationController( | 89 touch_exploration_controller_.reset(new ui::TouchExplorationController( |
| 90 root_window_controller_->GetRootWindow(), this)); | 90 root_window_controller_->GetRootWindow(), this)); |
| 91 } else if (!enabled) { | 91 } else if (!enabled) { |
| 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 !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 |
| OLD | NEW |