aura: brightness and volume bubble.

chrome/browser/chromeos/volume_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/volume_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"
+#include "views/widget/widget.h"
 
 namespace chromeos {
 
-VolumeBubble::VolumeBubble()
-    : SettingLevelBubble(
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
-              IDR_VOLUME_BUBBLE_UP_ICON),
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
-              IDR_VOLUME_BUBBLE_DOWN_ICON),
-          ResourceBundle::GetSharedInstance().GetBitmapNamed(
-              IDR_VOLUME_BUBBLE_MUTE_ICON)) {
+VolumeBubble::VolumeBubble() : widget_(NULL) {}
+
+VolumeBubble::~VolumeBubble() {
+  if (widget_)
+    delete widget_;
+}
+
+void VolumeBubble::ShowBubble(double percent, bool enabled) {
+  if (!widget_) {
+    widget_= SettingLevelBubble::CreateSettingLevelBubble(
+        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+            IDR_VOLUME_BUBBLE_UP_ICON),
+        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+            IDR_VOLUME_BUBBLE_DOWN_ICON),
+        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+            IDR_VOLUME_BUBBLE_MUTE_ICON),
+        percent,
+        enabled);
+  } else {
+    static_cast<SettingLevelBubble*>(widget_->widget_delegate())

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

i think that there's a decent amount of duplicated code between BrightnessBubble
and VolumeBubble now.  would it be feasible to push it into SettingLevelBubble?

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

moved.

+        ->UpdateSetting(percent, enabled);
+  }
+  // Starts a new fade out animation and show.
+  widget_->client_view()->AsBubbleView()->StartFade(/*fade_in=*/false);
+  static_cast<SettingLevelBubble*>(widget_->widget_delegate())
+      ->StartHideTimer();
+}
+
+void VolumeBubble::HideBubble() {

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

Is this used at all?

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

ya. in brightness_observer.cc BrightnessChanged. I think it's because at any
given time we should only show a brightness bubble or a volume bubble.

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