ash/common/system/audio/volume_view.h - Issue 2084533008: mash: Migrate tray audio and deps to 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/audio/volume_view.h

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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 #ifndef ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_	5 #ifndef ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_

6 #define ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_	6 #define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_

7	7

8 #include "ash/common/system/tray/actionable_view.h"	8 #include "ash/common/system/tray/actionable_view.h"

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

10 #include "ui/gfx/font.h"	10 #include "ui/gfx/font.h"

11 #include "ui/views/controls/button/button.h"	11 #include "ui/views/controls/button/button.h"

12 #include "ui/views/controls/slider.h"	12 #include "ui/views/controls/slider.h"

13	13

14 namespace views {	14 namespace views {

15 class View;	15 class View;

16 class ImageView;	16 class ImageView;

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 views::ImageView* device_type_;	74 views::ImageView* device_type_;

75 views::ImageView* more_;	75 views::ImageView* more_;

76 bool is_default_view_;	76 bool is_default_view_;

77	77

78 DISALLOW_COPY_AND_ASSIGN(VolumeView);	78 DISALLOW_COPY_AND_ASSIGN(VolumeView);

79 };	79 };

80	80

81 } // namespace tray	81 } // namespace tray

82 } // namespace ash	82 } // namespace ash

83	83

84 #endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_	84 #endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_

OLD	NEW

« no previous file with comments | « ash/common/system/audio/tray_audio_delegate.h ('k') | ash/common/system/audio/volume_view.cc » ('j') | no next file with comments »