chrome/browser/ui/ash/volume_controller_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_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

« no previous file with comments | « chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

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 "chrome/browser/ui/ash/volume_controller_chromeos.h"	5 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"

6	6

7 #include "ash/common/ash_switches.h"

8 #include "base/command_line.h"	7 #include "base/command_line.h"

9 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	9 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

11 #include "chrome/browser/extensions/api/system_private/system_private_api.h"	10 #include "chrome/browser/extensions/api/system_private/system_private_api.h"

12 #include "chrome/grit/browser_resources.h"	11 #include "chrome/grit/browser_resources.h"

13 #include "chromeos/audio/chromeos_sounds.h"	12 #include "chromeos/audio/chromeos_sounds.h"

14 #include "chromeos/chromeos_switches.h"	13 #include "chromeos/chromeos_switches.h"

15 #include "content/public/browser/user_metrics.h"	14 #include "content/public/browser/user_metrics.h"

16 #include "media/audio/sounds/sounds_manager.h"	15 #include "media/audio/sounds/sounds_manager.h"

17 #include "ui/base/resource/resource_bundle.h"	16 #include "ui/base/resource/resource_bundle.h"

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 audio_handler->IsOutputMuted());	101 audio_handler->IsOutputMuted());

103 }	102 }

104	103

105 void VolumeController::OnOutputMuteChanged(bool /* mute_on */,	104 void VolumeController::OnOutputMuteChanged(bool /* mute_on */,

106 bool /* system_adjust */) {	105 bool /* system_adjust */) {

107 CrasAudioHandler* audio_handler = CrasAudioHandler::Get();	106 CrasAudioHandler* audio_handler = CrasAudioHandler::Get();

108 extensions::DispatchVolumeChangedEvent(	107 extensions::DispatchVolumeChangedEvent(

109 audio_handler->GetOutputVolumePercent(),	108 audio_handler->GetOutputVolumePercent(),

110 audio_handler->IsOutputMuted());	109 audio_handler->IsOutputMuted());

111 }	110 }

OLD	NEW