ash/common/system/chromeos/audio/tray_audio_chromeos.cc - Issue 2113113002: mash: Move chromeos audio system tray files to //ash/common

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: ash/common/system/chromeos/audio/tray_audio_chromeos.cc

Issue 2113113002: mash: Move chromeos audio system tray files to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 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/system/chromeos/audio/tray_audio_chromeos.h"	5 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"

6	6

7 #include "ash/common/system/audio/volume_view.h"	7 #include "ash/common/system/audio/volume_view.h"

	8 #include "ash/common/system/chromeos/audio/audio_detailed_view.h"

	9 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"

8 #include "ash/common/wm_shell.h"	10 #include "ash/common/wm_shell.h"

9 #include "ash/system/chromeos/audio/audio_detailed_view.h"

10 #include "ash/system/chromeos/audio/tray_audio_delegate_chromeos.h"

11 #include "chromeos/dbus/dbus_thread_manager.h"	11 #include "chromeos/dbus/dbus_thread_manager.h"

12 #include "ui/views/view.h"	12 #include "ui/views/view.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 using system::TrayAudioDelegate;	16 using system::TrayAudioDelegate;

17 using system::TrayAudioDelegateChromeOs;	17 using system::TrayAudioDelegateChromeOs;

18	18

19 TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray)	19 TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray)

20 : TrayAudio(	20 : TrayAudio(

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 }	85 }

86	86

87 void TrayAudioChromeOs::SuspendDone(const base::TimeDelta& sleep_duration) {	87 void TrayAudioChromeOs::SuspendDone(const base::TimeDelta& sleep_duration) {

88 // This event is triggered when the device resumes after earlier suspension,	88 // This event is triggered when the device resumes after earlier suspension,

89 // we should always start or re-start HDMI re-discovering	89 // we should always start or re-start HDMI re-discovering

90 // grace period right after this event.	90 // grace period right after this event.

91 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true);	91 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true);

92 }	92 }

93	93

94 } // namespace ash	94 } // namespace ash

OLD	NEW