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

Unified Diff: trunk/src/ash/system/audio/volume_view.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/system/audio/tray_audio_delegate.h ('k') | trunk/src/ash/system/audio/volume_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/system/audio/volume_view.h
===================================================================
--- trunk/src/ash/system/audio/volume_view.h (revision 252005)
+++ trunk/src/ash/system/audio/volume_view.h (working copy)
@@ -1,90 +0,0 @@
-// Copyright 2014 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_VOLUME_VIEW_H_
-#define ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_
-
-#include "ash/system/tray/actionable_view.h"
-#include "ui/gfx/font.h"
-#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/slider.h"
-
-namespace views {
-class View;
-class ImageView;
-}
-
-namespace ash {
-
-class SystemTrayItem;
-
-namespace system {
-class TrayAudioDelegate;
-}
-
-namespace internal {
-
-class HoverHighlightView;
-
-namespace tray {
-
-class BarSeparator;
-class VolumeButton;
-class VolumeSlider;
-
-class VolumeView : public ActionableView,
- public views::ButtonListener,
- public views::SliderListener {
- public:
- VolumeView(SystemTrayItem* owner,
- system::TrayAudioDelegate* audio_delegate,
- bool is_default_view);
-
- virtual ~VolumeView();
-
- void Update();
-
- // Sets volume level on slider_, |percent| is ranged from [0.00] to [1.00].
- void SetVolumeLevel(float percent);
-
- private:
- // Updates bar_, device_type_ icon, and more_ buttons.
- void UpdateDeviceTypeAndMore();
- void HandleVolumeUp(float percent);
- void HandleVolumeDown(float percent);
-
- // Overridden from views::View.
- virtual void Layout() OVERRIDE;
-
- // Overridden from views::ButtonListener.
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
-
- // Overridden from views::SliderListener.
- virtual void SliderValueChanged(views::Slider* sender,
- float value,
- float old_value,
- views::SliderChangeReason reason) OVERRIDE;
-
- // Overriden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE;
-
- SystemTrayItem* owner_;
- system::TrayAudioDelegate* audio_delegate_;
- VolumeButton* icon_;
- VolumeSlider* slider_;
- BarSeparator* bar_;
- views::ImageView* device_type_;
- views::ImageView* more_;
- bool is_default_view_;
-
- DISALLOW_COPY_AND_ASSIGN(VolumeView);
-};
-
-} // namespace tray
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_
-
« no previous file with comments | « trunk/src/ash/system/audio/tray_audio_delegate.h ('k') | trunk/src/ash/system/audio/volume_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698