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

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

Issue 8319008: aura: brightness and volume bubble. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: update, and added tests. 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/brightness_bubble.h" 5 #include "chrome/browser/chromeos/brightness_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 BrightnessBubble::BrightnessBubble()
14 : SettingLevelBubble(
15 ResourceBundle::GetSharedInstance().GetBitmapNamed(
16 IDR_BRIGHTNESS_BUBBLE_ICON),
17 ResourceBundle::GetSharedInstance().GetBitmapNamed(
18 IDR_BRIGHTNESS_BUBBLE_ICON),
19 ResourceBundle::GetSharedInstance().GetBitmapNamed(
20 IDR_BRIGHTNESS_BUBBLE_ICON)) {
21 }
22
23 // static 14 // static
24 BrightnessBubble* BrightnessBubble::GetInstance() { 15 BrightnessBubble* BrightnessBubble::GetInstance() {
25 return Singleton<BrightnessBubble>::get(); 16 return Singleton<BrightnessBubble>::get();
26 } 17 }
27 18
19 void BrightnessBubble::OnWidgetClosing(views::Widget* widget) {
20 // Bubble faded out.
21 if (widget_ == widget)
22 widget_closed_ = true;
Daniel Erat 2011/10/24 15:52:10 i don't understand why you need a widget_closed_ m
alicet1 2011/10/24 17:41:36 actually, yes!
23 }
24
25 void BrightnessBubble::ShowBubble(double percent, bool enabled) {
26 MaybeCreateWidget(percent, enabled);
27 SettingLevelBubble::ShowBubble(widget_, percent, enabled);
28 }
29
30 void BrightnessBubble::UpdateWithoutShowingBubble(double percent,
31 bool enabled) {
32 MaybeCreateWidget(percent, enabled);
33 static_cast<SettingLevelBubble*>(widget_->widget_delegate())
34 ->UpdateWithoutShowingBubble(percent, enabled);
35 }
36
37 void BrightnessBubble::HideBubble() {
38 if (widget_ && !widget_closed_) {
39 widget_->RemoveObserver(this);
40 widget_->Close();
41 }
42 }
43
44 BrightnessBubble::BrightnessBubble()
45 : widget_(NULL),
46 widget_closed_(false) {}
47
48 BrightnessBubble::~BrightnessBubble() {
49 if (widget_ && !widget_closed_) {
50 widget_->RemoveObserver(this);
51 widget_closed_ = true;
52 widget_ = NULL;
53 }
54 }
55
56 void BrightnessBubble::MaybeCreateWidget(double percent, bool enabled) {
57 if (!widget_ || widget_closed_) {
58 widget_ = SettingLevelBubble::CreateBubble(
59 ResourceBundle::GetSharedInstance().GetBitmapNamed(
60 IDR_BRIGHTNESS_BUBBLE_ICON),
61 ResourceBundle::GetSharedInstance().GetBitmapNamed(
62 IDR_BRIGHTNESS_BUBBLE_ICON),
63 ResourceBundle::GetSharedInstance().GetBitmapNamed(
64 IDR_BRIGHTNESS_BUBBLE_ICON),
65 percent,
66 enabled);
67 widget_->AddObserver(this);
68 widget_closed_ = false;
69 }
70 }
71
28 } // namespace chromeos 72 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698