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

Unified 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 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 side-by-side diff with in-line comments
Download patch
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..c4ba9a72fc6609b5c0c3aace9bbf262200563b80 100644
--- a/chrome/browser/chromeos/brightness_bubble.cc
+++ b/chrome/browser/chromeos/brightness_bubble.cc
@@ -7,22 +7,64 @@
#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(
- IDR_BRIGHTNESS_BUBBLE_ICON),
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
- IDR_BRIGHTNESS_BUBBLE_ICON)) {
-}
-
// static
BrightnessBubble* BrightnessBubble::GetInstance() {
return Singleton<BrightnessBubble>::get();
}
+void BrightnessBubble::OnWidgetClosing(views::Widget* widget) {
+ // Bubble faded out.
+ if (widget_ == widget)
+ widget_ = NULL;
+}
+
+void BrightnessBubble::ShowBubble(double percent, bool enabled) {
+ MaybeCreateWidget(percent, enabled);
+ SettingLevelBubble::ShowBubble(widget_, percent, enabled);
+}
+
+void BrightnessBubble::UpdateWithoutShowingBubble(double percent,
+ bool enabled) {
+ MaybeCreateWidget(percent, enabled);
+ static_cast<SettingLevelBubble*>(widget_->widget_delegate())
+ ->UpdateWithoutShowingBubble(percent, enabled);
+}
+
+void BrightnessBubble::HideBubble() {
+ if (widget_) {
+ widget_->RemoveObserver(this);
+ widget_->Close();
+ widget_ = NULL;
+ }
+}
+
+BrightnessBubble::BrightnessBubble()
+ : widget_(NULL) {}
+
+BrightnessBubble::~BrightnessBubble() {
+ if (widget_) {
+ widget_->RemoveObserver(this);
+ widget_ = NULL;
+ }
+}
+
+void BrightnessBubble::MaybeCreateWidget(double percent, bool enabled) {
+ if (!widget_) {
+ widget_ = SettingLevelBubble::CreateBubble(
+ ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ IDR_BRIGHTNESS_BUBBLE_ICON),
+ ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ IDR_BRIGHTNESS_BUBBLE_ICON),
+ ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ IDR_BRIGHTNESS_BUBBLE_ICON),
+ percent,
+ enabled);
+ widget_->AddObserver(this);
+ }
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698