Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: ash/system/chromeos/audio/tray_volume.h

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
« no previous file with comments | « ash/system/chromeos/audio/audio_observer.h ('k') | ash/system/chromeos/audio/tray_volume.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_
6 #define ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_
7 7
8 #include "ash/system/audio/audio_observer.h" 8 #include "ash/system/chromeos/audio/audio_observer.h"
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace internal { 12 namespace internal {
13 13
14 namespace tray { 14 namespace tray {
15 class VolumeView; 15 class VolumeView;
16 } 16 }
17 17
18 class TrayVolume : public TrayImageItem, 18 class TrayVolume : public TrayImageItem,
(...skipping 24 matching lines...) Expand all
43 // CreateDetailedView()? Used to avoid resetting |volume_view_| 43 // CreateDetailedView()? Used to avoid resetting |volume_view_|
44 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). 44 // inappropriately in DestroyDefaultView() or DestroyDetailedView().
45 bool is_default_view_; 45 bool is_default_view_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(TrayVolume); 47 DISALLOW_COPY_AND_ASSIGN(TrayVolume);
48 }; 48 };
49 49
50 } // namespace internal 50 } // namespace internal
51 } // namespace ash 51 } // namespace ash
52 52
53 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ 53 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/audio/audio_observer.h ('k') | ash/system/chromeos/audio/tray_volume.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698