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/aura/wm_root_window_controller_aura.h" | 7 #include "ash/aura/wm_root_window_controller_aura.h" |
8 #include "ash/common/accessibility_delegate.h" | 8 #include "ash/common/accessibility_delegate.h" |
9 #include "ash/common/system/tray/system_tray_notifier.h" | 9 #include "ash/common/system/tray/system_tray_notifier.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
11 #include "ash/common/wm_window.h" | 11 #include "ash/common/wm_window.h" |
12 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 16 #include "base/memory/ptr_util.h" |
16 #include "chromeos/audio/chromeos_sounds.h" | 17 #include "chromeos/audio/chromeos_sounds.h" |
17 #include "chromeos/audio/cras_audio_handler.h" | 18 #include "chromeos/audio/cras_audio_handler.h" |
18 #include "chromeos/chromeos_switches.h" | 19 #include "chromeos/chromeos_switches.h" |
19 #include "ui/chromeos/touch_exploration_controller.h" | 20 #include "ui/chromeos/touch_exploration_controller.h" |
20 #include "ui/wm/public/activation_client.h" | 21 #include "ui/wm/public/activation_client.h" |
21 | 22 |
22 namespace ash { | 23 namespace ash { |
23 | 24 |
24 AshTouchExplorationManager::AshTouchExplorationManager( | 25 AshTouchExplorationManager::AshTouchExplorationManager( |
25 RootWindowController* root_window_controller) | 26 RootWindowController* root_window_controller) |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 touch_exploration_controller_.reset(); | 172 touch_exploration_controller_.reset(); |
172 } | 173 } |
173 } | 174 } |
174 | 175 |
175 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { | 176 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { |
176 return !base::CommandLine::ForCurrentProcess()->HasSwitch( | 177 return !base::CommandLine::ForCurrentProcess()->HasSwitch( |
177 chromeos::switches::kDisableVolumeAdjustSound); | 178 chromeos::switches::kDisableVolumeAdjustSound); |
178 } | 179 } |
179 | 180 |
180 } // namespace ash | 181 } // namespace ash |
OLD | NEW |