chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc - Issue 2314853003: Move ash::DisplayManager switches to ui::display

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

OLD	NEW
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"	10

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	14 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

15 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"	15 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"

16 #include "chrome/test/base/in_process_browser_test.h"	16 #include "chrome/test/base/in_process_browser_test.h"

17 #include "chromeos/audio/chromeos_sounds.h"	17 #include "chromeos/audio/chromeos_sounds.h"

18 #include "chromeos/audio/cras_audio_handler.h"	18 #include "chromeos/audio/cras_audio_handler.h"

19 #include "chromeos/chromeos_switches.h"	19 #include "chromeos/chromeos_switches.h"

20 #include "media/audio/sounds/sounds_manager.h"	20 #include "media/audio/sounds/sounds_manager.h"

(...skipping 237 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
258 EXPECT_FALSE(is_sound_initialized());	258 EXPECT_FALSE(is_sound_initialized());

259	259

260 // Check that sound isn't played on volume up and volume down.	260 // Check that sound isn't played on volume up and volume down.

261 audio_handler_->SetOutputVolumePercent(50);	261 audio_handler_->SetOutputVolumePercent(50);

262 VolumeUp();	262 VolumeUp();

263 VolumeDown();	263 VolumeDown();

264 EXPECT_EQ(0, num_play_requests());	264 EXPECT_EQ(0, num_play_requests());

265 }	265 }

266	266

267 } // namespace	267 } // namespace

OLD	NEW