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

Unified Diff: ash/common/system/audio/volume_view.h

Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes (Closed)
Patch Set: cleanest diff ever 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/system/audio/volume_view.h
diff --git a/ash/common/system/audio/volume_view.h b/ash/common/system/audio/volume_view.h
deleted file mode 100644
index 3eba8b5705930cb938b17138a9be71d226a35f5c..0000000000000000000000000000000000000000
--- a/ash/common/system/audio/volume_view.h
+++ /dev/null
@@ -1,80 +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_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
-#define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
-
-#include "ash/common/system/tray/actionable_view.h"
-#include "base/macros.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;
-class Separator;
-class Slider;
-}
-
-namespace ash {
-class SystemTrayItem;
-
-namespace system {
-class TrayAudioDelegate;
-}
-
-namespace tray {
-class VolumeButton;
-
-class VolumeView : public ActionableView,
- public views::SliderListener {
- public:
- VolumeView(SystemTrayItem* owner,
- system::TrayAudioDelegate* audio_delegate,
- bool is_default_view);
-
- ~VolumeView() override;
-
- 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::SliderListener.
- void SliderValueChanged(views::Slider* sender,
- float value,
- float old_value,
- views::SliderChangeReason reason) override;
-
- // Overriden from ActionableView.
- bool PerformAction(const ui::Event& event) override;
- void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
- // views::View:
- void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
- void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
-
- system::TrayAudioDelegate* audio_delegate_;
- views::View* more_region_;
- VolumeButton* icon_;
- views::Slider* slider_;
- views::Separator* separator_;
- views::ImageView* device_type_;
- views::ImageView* more_;
- bool is_default_view_;
-
- DISALLOW_COPY_AND_ASSIGN(VolumeView);
-};
-
-} // namespace tray
-} // namespace ash
-
-#endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698