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

Unified Diff: ash/system/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/audio/audio_observer.h ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/audio/tray_volume.h
diff --git a/ash/system/audio/tray_volume.h b/ash/system/audio/tray_volume.h
deleted file mode 100644
index ec04943b6063c086f9c217be4033dfe4096ca6a1..0000000000000000000000000000000000000000
--- a/ash/system/audio/tray_volume.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_
-#define ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_
-
-#include "ash/system/audio/audio_observer.h"
-#include "ash/system/tray/tray_image_item.h"
-
-namespace ash {
-namespace internal {
-
-namespace tray {
-class VolumeView;
-}
-
-class TrayVolume : public TrayImageItem,
- public AudioObserver {
- public:
- explicit TrayVolume(SystemTray* system_tray);
- virtual ~TrayVolume();
-
- private:
- // Overridden from TrayImageItem.
- virtual bool GetInitialVisibility() OVERRIDE;
-
- // Overridden from SystemTrayItem.
- virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
- virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
- virtual void DestroyDefaultView() OVERRIDE;
- virtual void DestroyDetailedView() OVERRIDE;
- virtual bool ShouldHideArrow() const OVERRIDE;
- virtual bool ShouldShowLauncher() const OVERRIDE;
-
- // Overridden from AudioObserver.
- virtual void OnVolumeChanged(float percent) OVERRIDE;
- virtual void OnMuteToggled() OVERRIDE;
-
- tray::VolumeView* volume_view_;
-
- // Was |volume_view_| created for CreateDefaultView() rather than
- // CreateDetailedView()? Used to avoid resetting |volume_view_|
- // inappropriately in DestroyDefaultView() or DestroyDetailedView().
- bool is_default_view_;
-
- DISALLOW_COPY_AND_ASSIGN(TrayVolume);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_
« no previous file with comments | « ash/system/audio/audio_observer.h ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698