Chromium Code Reviews| Index: chrome/browser/chromeos/brightness_bubble.cc |
| diff --git a/chrome/browser/chromeos/brightness_bubble.cc b/chrome/browser/chromeos/brightness_bubble.cc |
| index 7c149aacde2b3e23cb1fcf20960756688df41a0c..8784f15be33bf41a46b3ae02c4fdcb673bdc4916 100644 |
| --- a/chrome/browser/chromeos/brightness_bubble.cc |
| +++ b/chrome/browser/chromeos/brightness_bubble.cc |
| @@ -7,17 +7,43 @@ |
| #include "base/memory/singleton.h" |
| #include "grit/theme_resources.h" |
| #include "ui/base/resource/resource_bundle.h" |
| +#include "views/widget/widget.h" |
| namespace chromeos { |
| -BrightnessBubble::BrightnessBubble() |
| - : SettingLevelBubble( |
| - ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| - IDR_BRIGHTNESS_BUBBLE_ICON), |
| - ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| +views::Widget* BrightnessBubble::widget_ = NULL; |
| + |
| +BrightnessBubble::BrightnessBubble() {} |
| + |
| +void BrightnessBubble::ShowBubble(double percent, bool enabled) { |
| + if (!widget_) { |
| + widget_= SettingLevelBubble::ConstructSettingLevelBubble( |
| + ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| + IDR_BRIGHTNESS_BUBBLE_ICON), |
| + ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| IDR_BRIGHTNESS_BUBBLE_ICON), |
| - ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| - IDR_BRIGHTNESS_BUBBLE_ICON)) { |
| + ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| + IDR_BRIGHTNESS_BUBBLE_ICON), |
| + percent, |
| + enabled); |
| + } else { |
| + static_cast<SettingLevelBubble*>(widget_->widget_delegate()) |
| + ->UpdateSettingLevelInternal(percent, enabled); |
|
Daniel Erat
2011/10/19 17:28:09
nit: it seems strange to be calling a method named
alicet1
2011/10/20 15:03:08
Done.
|
| + } |
| + widget_->Show(); |
| + static_cast<SettingLevelBubble*>(widget_->widget_delegate()) |
| + ->StartHideTimer(); |
| +} |
| + |
| +void BrightnessBubble::UpdateWithoutShowingBubble(int level, bool enabled) { |
| + if (widget_) |
| + static_cast<SettingLevelBubble*>(widget_->widget_delegate()) |
| + ->UpdateWithoutShowingBubble(level, enabled); |
| +} |
| + |
| +void BrightnessBubble::HideBubble() { |
| + if (widget_) |
| + widget_->Close(); |
| } |
| // static |