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

Side by Side Diff: ash/ash_touch_exploration_manager_chromeos.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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
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"
8 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "ash/common/accessibility_delegate.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"
11 #include "ash/system/tray/system_tray_notifier.h" 11 #include "ash/system/tray/system_tray_notifier.h"
12 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "chromeos/audio/chromeos_sounds.h" 14 #include "chromeos/audio/chromeos_sounds.h"
15 #include "chromeos/audio/cras_audio_handler.h" 15 #include "chromeos/audio/cras_audio_handler.h"
16 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
17 #include "ui/chromeos/touch_exploration_controller.h" 17 #include "ui/chromeos/touch_exploration_controller.h"
18 #include "ui/wm/public/activation_client.h" 18 #include "ui/wm/public/activation_client.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 touch_exploration_controller_.reset(); 126 touch_exploration_controller_.reset();
127 } 127 }
128 } 128 }
129 129
130 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() { 130 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
131 return !base::CommandLine::ForCurrentProcess()->HasSwitch( 131 return !base::CommandLine::ForCurrentProcess()->HasSwitch(
132 chromeos::switches::kDisableVolumeAdjustSound); 132 chromeos::switches::kDisableVolumeAdjustSound);
133 } 133 }
134 134
135 } // namespace ash 135 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/audio/sounds.cc » ('j') | ash/common/session/session_state_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698