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

Side by Side Diff: ash/ash_touch_exploration_manager_chromeos.cc

Issue 2142463002: ash: Remove media dependency from ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oops Created 4 years, 5 months 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.gyp ('k') | ash/audio/sounds.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/audio/sounds.h"
8 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/system/tray/system_tray_notifier.h" 8 #include "ash/common/system/tray/system_tray_notifier.h"
10 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
11 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
12 #include "ash/shell.h" 11 #include "ash/shell.h"
13 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "chromeos/audio/chromeos_sounds.h" 14 #include "chromeos/audio/chromeos_sounds.h"
16 #include "chromeos/audio/cras_audio_handler.h" 15 #include "chromeos/audio/cras_audio_handler.h"
17 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 touch_exploration_controller_.reset(); 124 touch_exploration_controller_.reset();
126 } 125 }
127 } 126 }
128 127
129 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { 128 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
130 return !base::CommandLine::ForCurrentProcess()->HasSwitch( 129 return !base::CommandLine::ForCurrentProcess()->HasSwitch(
131 chromeos::switches::kDisableVolumeAdjustSound); 130 chromeos::switches::kDisableVolumeAdjustSound);
132 } 131 }
133 132
134 } // namespace ash 133 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/audio/sounds.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698