ash/system/chromeos/audio/tray_volume.cc - Issue 14077010: Move ash tray audio UI code from ash/system/audio to ash/system/chromeos/audio.

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/system/chromeos/audio/tray_volume.cc

Issue 14077010: Move ash tray audio UI code from ash/system/audio to ash/system/chromeos/audio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make audio code CHROMROS only in SystemTrayNotifier. Created 7 years, 8 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 | Annotate | Revision Log

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 "ash/system/audio/tray_volume.h"	5 #include "ash/system/chromeos/audio/tray_volume.h"

6	6

7 #include <cmath>	7 #include <cmath>

8	8

9 #include "ash/ash_constants.h"	9 #include "ash/ash_constants.h"

10 #include "ash/shell.h"	10 #include "ash/shell.h"

11 #include "ash/system/tray/system_tray_delegate.h"	11 #include "ash/system/tray/system_tray_delegate.h"

12 #include "ash/system/tray/system_tray_notifier.h"	12 #include "ash/system/tray/system_tray_notifier.h"

13 #include "ash/system/tray/tray_bar_button_with_title.h"	13 #include "ash/system/tray/tray_bar_button_with_title.h"

14 #include "ash/system/tray/tray_constants.h"	14 #include "ash/system/tray/tray_constants.h"

15 #include "ash/volume_control_delegate.h"	15 #include "ash/volume_control_delegate.h"

(...skipping 263 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
279 tray_view()->SetVisible(GetInitialVisibility());	279 tray_view()->SetVisible(GetInitialVisibility());

280	280

281 if (volume_view_)	281 if (volume_view_)

282 volume_view_->Update();	282 volume_view_->Update();

283 else	283 else

284 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);	284 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);

285 }	285 }

286	286

287 } // namespace internal	287 } // namespace internal

288 } // namespace ash	288 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/chromeos/audio/tray_volume.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »