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

Side by Side Diff: trunk/src/ash/system/chromeos/audio/tray_audio.h

Issue 170843009: Revert 251959 "Refactor the TrayAudio code so that it can be use..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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
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_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 #include "chromeos/audio/cras_audio_handler.h" 9 #include "chromeos/audio/cras_audio_handler.h"
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // Otherwise, it should be created for detailed view in ash tray bubble. 52 // Otherwise, it should be created for detailed view in ash tray bubble.
53 bool pop_up_volume_view_; 53 bool pop_up_volume_view_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 55 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
56 }; 56 };
57 57
58 } // namespace internal 58 } // namespace internal
59 } // namespace ash 59 } // namespace ash
60 60
61 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 61 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/system/chromeos/audio/audio_detailed_view.cc ('k') | trunk/src/ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698