chrome/browser/ui/ash/volume_controller_browsertest.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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 | « chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/accessibility_delegate.h"

9 #include "ash/common/accessibility_types.h"	9 #include "ash/accessibility_types.h"

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

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

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

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

14 #include "chrome/browser/ui/ash/volume_controller.h"	14 #include "chrome/browser/ui/ash/volume_controller.h"

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

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

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

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

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

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

239	239

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

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

242 volume_controller_->VolumeUp();	242 volume_controller_->VolumeUp();

243 volume_controller_->VolumeDown();	243 volume_controller_->VolumeDown();

244 EXPECT_EQ(0, num_play_requests());	244 EXPECT_EQ(0, num_play_requests());

245 }	245 }

246	246

247 } // namespace	247 } // namespace

OLD	NEW