ash/common/system/chromeos/audio/volume_view.h - Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes

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/volume_view.h

Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes (Closed)

Patch Set: rebase Created 4 years, 1 month 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_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_	5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_

6 #define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_	6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_

7	7

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

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

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

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

12	12

13 namespace views {	13 namespace views {

14 class CustomButton;	14 class CustomButton;

15 class ImageView;	15 class ImageView;

16 class Separator;	16 class Separator;

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 views::Separator* separator_; // Not used in material design.	73 views::Separator* separator_; // Not used in material design.

74 views::ImageView* device_type_;	74 views::ImageView* device_type_;

75 bool is_default_view_;	75 bool is_default_view_;

76	76

77 DISALLOW_COPY_AND_ASSIGN(VolumeView);	77 DISALLOW_COPY_AND_ASSIGN(VolumeView);

78 };	78 };

79	79

80 } // namespace tray	80 } // namespace tray

81 } // namespace ash	81 } // namespace ash

82	82

83 #endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_	83 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_

OLD	NEW

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