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

Side by Side Diff: chrome/browser/chromeos/volume_bubble.cc

Issue 8319008: aura: brightness and volume bubble. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: update Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/chromeos/volume_bubble.h" 5 #include "chrome/browser/chromeos/volume_bubble.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "views/widget/widget.h"
10 11
11 namespace chromeos { 12 namespace chromeos {
12 13
13 VolumeBubble::VolumeBubble() 14 VolumeBubble::VolumeBubble() : widget_(NULL) {}
msw 2011/10/21 02:42:06 Move the private ctor and dtor below the public fu
alicet1 2011/10/21 18:11:36 Done.
14 : SettingLevelBubble( 15
15 ResourceBundle::GetSharedInstance().GetBitmapNamed( 16 VolumeBubble::~VolumeBubble() {
16 IDR_VOLUME_BUBBLE_UP_ICON), 17 delete widget_;
17 ResourceBundle::GetSharedInstance().GetBitmapNamed( 18 widget_ = NULL;
18 IDR_VOLUME_BUBBLE_DOWN_ICON), 19 }
19 ResourceBundle::GetSharedInstance().GetBitmapNamed( 20
20 IDR_VOLUME_BUBBLE_MUTE_ICON)) { 21 void VolumeBubble::ShowBubble(double percent, bool enabled) {
22 widget_= SettingLevelBubble::ShowBubble(
Daniel Erat 2011/10/21 00:25:21 nit: space between 'widget_' and '='
alicet1 2011/10/21 18:11:36 Done.
23 widget_,
24 ResourceBundle::GetSharedInstance().GetBitmapNamed(
25 IDR_VOLUME_BUBBLE_UP_ICON),
26 ResourceBundle::GetSharedInstance().GetBitmapNamed(
27 IDR_VOLUME_BUBBLE_DOWN_ICON),
28 ResourceBundle::GetSharedInstance().GetBitmapNamed(
29 IDR_VOLUME_BUBBLE_MUTE_ICON),
30 percent,
31 enabled);
32 }
33
34 void VolumeBubble::HideBubble() {
35 if (widget_)
36 widget_->Close();
21 } 37 }
22 38
23 // static 39 // static
24 VolumeBubble* VolumeBubble::GetInstance() { 40 VolumeBubble* VolumeBubble::GetInstance() {
25 return Singleton<VolumeBubble>::get(); 41 return Singleton<VolumeBubble>::get();
26 } 42 }
27 43
28 } // namespace chromeos 44 } // namespace chromeos
OLDNEW
« chrome/browser/chromeos/volume_bubble.h ('K') | « chrome/browser/chromeos/volume_bubble.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698