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

Side by Side Diff: chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <memory> 5 #include <memory>
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/accessibility_types.h" 9 #include "ash/common/accessibility_types.h"
10 #include "ash/common/ash_switches.h"
11 #include "base/command_line.h" 10 #include "base/command_line.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
15 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 14 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
16 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chromeos/audio/chromeos_sounds.h" 16 #include "chromeos/audio/chromeos_sounds.h"
18 #include "chromeos/audio/cras_audio_handler.h" 17 #include "chromeos/audio/cras_audio_handler.h"
19 #include "chromeos/chromeos_switches.h" 18 #include "chromeos/chromeos_switches.h"
20 #include "media/audio/sounds/sounds_manager.h" 19 #include "media/audio/sounds/sounds_manager.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 EXPECT_FALSE(is_sound_initialized()); 257 EXPECT_FALSE(is_sound_initialized());
259 258
260 // Check that sound isn't played on volume up and volume down. 259 // Check that sound isn't played on volume up and volume down.
261 audio_handler_->SetOutputVolumePercent(50); 260 audio_handler_->SetOutputVolumePercent(50);
262 VolumeUp(); 261 VolumeUp();
263 VolumeDown(); 262 VolumeDown();
264 EXPECT_EQ(0, num_play_requests()); 263 EXPECT_EQ(0, num_play_requests());
265 } 264 }
266 265
267 } // namespace 266 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/volume_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698