aura: brightness and volume bubble.

chrome/browser/chromeos/setting_level_bubble.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/browser/ui/views/bubble/bubble.h"
+#include "views/bubble/bubble_delegate.h"
 
 class SkBitmap;
 
 namespace chromeos {
 
 class SettingLevelBubbleView;
 
 // Singleton class controlling a bubble displaying a level-based setting like
 // volume or brightness.
-class SettingLevelBubble : public BubbleDelegate {
+class SettingLevelBubble : public views::BubbleDelegateView {
  public:
-  // Shows the bubble.  |percent| should be in the range [0.0, 100.0].
-  void ShowBubble(double percent, bool enabled);
-  void HideBubble();
+  // Create the bubble delegate and view.
+  // |percent| should be in the range [0.0, 100.0].
+  static views::Widget* CreateBubble(SkBitmap* increase_icon,
+                                     SkBitmap* decrease_icon,
+                                     SkBitmap* zero_icon,
+                                     double percent,
+                                     bool enabled);
+
+  // Show the setting level bubble for this |widget|.
+  static void ShowBubble(views::Widget* widget,
+                         double percent,
+                         bool enabled);
+
+  virtual ~SettingLevelBubble();
+
+  // BubbleDelegate overrides:
+  virtual void Init() OVERRIDE;

[msw, 2011/10/22 00:44:48]

BubbleDelegateView::Init is declared protected, this override should retain that
visibility and ordering.

[alicet1, 2011/10/24 15:46:38]

Done.

+  virtual gfx::Point GetAnchorPoint() const OVERRIDE;
+
+  // WidgetDelegate overrides:
+  virtual void WindowClosing() OVERRIDE;
 
   // Updates the bubble's current level without showing the bubble onscreen.
   // We _do_ still animate the level moving to |percent| in case the bubble is
   // still visible from a previous call to ShowBubble().
   //
   // This can be used when the setting has been changed automatically and we
   // want to make sure that it's animated from the correct position the next
   // time that the bubble is shown.  For example:
   //
   // 1. Brightness is at 50%.
   // 2. Power manager dims brightness to 25% automatically.
   // 3. User hits the "increase brightness" button, setting brightness to 30%.
   //
   // If we didn't update our internal state to 25% after 2), then the animation
   // displayed in response to 3) would show the bubble animating from 50% down
   // to 30%, rather than from 25% up to 30%.
   void UpdateWithoutShowingBubble(double percent, bool enabled);
 
+  // Start the |hide_timer_| for this bubble.
+  void StartHideTimer();
+
  protected:
   SettingLevelBubble(SkBitmap* increase_icon,
                      SkBitmap* decrease_icon,
-                     SkBitmap* zero_icon);
-  virtual ~SettingLevelBubble();
+                     SkBitmap* zero_icon,
+                     const gfx::Rect& monitor_area);
 
  private:
-  // Overridden from BubbleDelegate.
-  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
-  virtual bool CloseOnEscape() OVERRIDE;
-  virtual bool FadeInOnShow() OVERRIDE;
-
-  // Callback for |hide_timer_|.  Closes the bubble.
+  // Callback for |hide_timer_|.  Starts fading out.
   void OnHideTimeout();
 
   // Callback for |animation_timer_|.  Updates the level displayed by the view,
   // also stopping the animation if we've reached the target.
   void OnAnimationTimeout();
 
   // Animates towards |percent|.  Updates |target_percent_| and starts
   // |animation_timer_| if it's not already running.  If this is the first time
   // that the level is being set, we just update |view_| immediately and don't
   // animate.
@@ skipping 14 matching lines @@
   base::TimeTicks last_animation_update_time_;
 
   // Time at which |target_percent_| was last updated.
   base::TimeTicks last_target_update_time_;
 
   // Icons displayed in the bubble when increasing or decreasing the level or
   // when it's disabled.  Not owned by us.
   SkBitmap* increase_icon_;
   SkBitmap* decrease_icon_;
   SkBitmap* disabled_icon_;
+  SkBitmap* current_icon_;
 
-  // Currently shown bubble or NULL.
-  Bubble* bubble_;
+  bool enabled_;

[msw, 2011/10/22 00:44:48]

Comment?

[alicet1, 2011/10/24 15:46:38]

Done.

 
   // Contents view owned by Bubble.
   SettingLevelBubbleView* view_;
 
   // Timer to hide the bubble.
   base::OneShotTimer<SettingLevelBubble> hide_timer_;
 
   // Timer to animate the currently-shown percent.  We use a timer instead of
   // ui::Animation since our animations are frequently interrupted by additional
   // changes to the level, and ui::Animation doesn't provide much control over
   // in-progress animations, leading to mega-jank.
   base::RepeatingTimer<SettingLevelBubble> animation_timer_;
 
   // Is |animation_timer_| currently running?
   bool is_animating_;
 
+  // |monitor_area_| associated with the top level widget.

[msw, 2011/10/22 00:44:48]

I think plain text "Monitor area" makes more sense than |monitor_area_| in this
comment.

[alicet1, 2011/10/24 15:46:38]

Done.

+  gfx::Rect monitor_area_;
+
+  // size of the child view.

[msw, 2011/10/22 00:44:48]

capitalize 'size'

[alicet1, 2011/10/24 15:46:38]

Done.

+  gfx::Size view_size_;
+
   DISALLOW_COPY_AND_ASSIGN(SettingLevelBubble);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_