aura: brightness and volume bubble.

chrome/browser/chromeos/brightness_bubble.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/brightness_bubble.h"
 
 #include "base/memory/singleton.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "views/bubble/bubble_view.h"

[msw, 2011/10/20 19:36:13]

merge and remove bubble_view.h

[alicet1, 2011/10/20 22:36:30]

Done.

+#include "views/widget/widget.h"
 
 namespace chromeos {
 
-BrightnessBubble::BrightnessBubble()
-    : SettingLevelBubble(
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
+BrightnessBubble::BrightnessBubble() : widget_(NULL) {}
+
+BrightnessBubble::~BrightnessBubble() {
+  if (widget_)
+    delete widget_;

[Daniel Erat, 2011/10/20 15:43:39]

nit: deleting a null pointer is fine, so you can remove the if statement.  also
suggest setting widget_ to NULL afterwards

[alicet1, 2011/10/20 22:36:30]

Done.

+}
+
+void BrightnessBubble::ShowBubble(double percent, bool enabled) {
+  if (!widget_) {
+    widget_= SettingLevelBubble::CreateSettingLevelBubble(
+        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)) {
+        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+            IDR_BRIGHTNESS_BUBBLE_ICON),
+        percent,
+        enabled);
+  } else {
+    static_cast<SettingLevelBubble*>(widget_->widget_delegate())
+        ->UpdateSetting(percent, enabled);
+  }
+  // Starts a new fade out animation and show.
+  widget_->client_view()->AsBubbleView()->StartFade(/*fade_in=*/false);

[Daniel Erat, 2011/10/20 15:43:39]

nit: comment style i've seen more frequently for parameters in chrome is

  StartFade(false /* fade_in */);

[Daniel Erat, 2011/10/20 15:43:39]

does this mean that we start fading the bubble out immediately?  if so, i don't
think that that's desired -- we should show it at full opacity for a bit and
then fade it out quickly

[alicet1, 2011/10/20 22:36:30]

Done.

[alicet1, 2011/10/20 22:36:30]

yup, changed.

+  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() {

[msw, 2011/10/20 19:36:13]

Is this called anywhere?

[alicet1, 2011/10/20 22:36:30]

yeah, in SystemKeyEventListener::ShowVolumeBubble, we end with a hide on
brightness bubble there.

+  if (widget_)
+    widget_->Close();
 }
 
 // static
 BrightnessBubble* BrightnessBubble::GetInstance() {
   return Singleton<BrightnessBubble>::get();
 }
 
 }  // namespace chromeos