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

Side by Side Diff: ash/common/system/audio/volume_view.h

Issue 2330403002: Do not activate system tray bubble by default (Closed)
Patch Set: Do not activate system tray bubble by default Created 4 years, 3 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
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.h ('k') | ash/common/system/audio/volume_view.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
6 #define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
7 7
8 #include "ash/common/system/tray/actionable_view.h" 8 #include "ash/common/system/tray/actionable_view.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/gfx/font.h" 10 #include "ui/gfx/font.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 float old_value, 58 float old_value,
59 views::SliderChangeReason reason) override; 59 views::SliderChangeReason reason) override;
60 60
61 // Overriden from ActionableView. 61 // Overriden from ActionableView.
62 bool PerformAction(const ui::Event& event) override; 62 bool PerformAction(const ui::Event& event) override;
63 63
64 // views::View: 64 // views::View:
65 void OnBoundsChanged(const gfx::Rect& previous_bounds) override; 65 void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
66 void GetAccessibleState(ui::AXViewState* state) override; 66 void GetAccessibleState(ui::AXViewState* state) override;
67 67
68 SystemTrayItem* owner_;
69 system::TrayAudioDelegate* audio_delegate_; 68 system::TrayAudioDelegate* audio_delegate_;
70 views::View* more_region_; 69 views::View* more_region_;
71 VolumeButton* icon_; 70 VolumeButton* icon_;
72 views::Slider* slider_; 71 views::Slider* slider_;
73 views::Separator* separator_; 72 views::Separator* separator_;
74 views::ImageView* device_type_; 73 views::ImageView* device_type_;
75 views::ImageView* more_; 74 views::ImageView* more_;
76 bool is_default_view_; 75 bool is_default_view_;
77 76
78 DISALLOW_COPY_AND_ASSIGN(VolumeView); 77 DISALLOW_COPY_AND_ASSIGN(VolumeView);
79 }; 78 };
80 79
81 } // namespace tray 80 } // namespace tray
82 } // namespace ash 81 } // namespace ash
83 82
84 #endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_ 83 #endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.h ('k') | ash/common/system/audio/volume_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698