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* CreateSettingLevelBubble(

[Daniel Erat, 2011/10/21 00:25:21]

nit: CreateBubble()?

[alicet1, 2011/10/21 18:11:36]

Done.

+      SkBitmap* increase_icon,
+      SkBitmap* decrease_icon,
+      SkBitmap* zero_icon,
+      double percent,
+      bool enabled);
+
+  virtual ~SettingLevelBubble();

[msw, 2011/10/21 02:42:06]

The destructor probably belongs below these static functions.

[alicet1, 2011/10/21 18:11:36]

Done.

+
+  // Show the setting level bubble for this |widget|, or if |widget| is
+  // null, create and return it also.
+  static views::Widget* ShowBubble(views::Widget* widget,

[Daniel Erat, 2011/10/21 00:25:21]

the semantics of this method seem strange.  i'd recommend just taking a non-null
widget along with the percent and enabled arguments.  it seems fine to require
the caller to cal either the Create() method or ShowBubble() as needed.

[alicet1, 2011/10/21 18:11:36]

Done.

+                                   SkBitmap* increase_icon,
+                                   SkBitmap* decrease_icon,
+                                   SkBitmap* disabled_icon,
+                                   double percent,
+                                   bool enabled);
 
   // 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);
 
+  // Calculate target percent and icon to be used when setting level changes.
+  void UpdateSetting(double percent, bool enabled);
+
+  // Start the |hide_timer_| for this bubble.
+  void StartHideTimer();
+
+  // BubbleDelegate overrides:

[Daniel Erat, 2011/10/21 00:25:21]

i think that other chrome code that i've seen usually puts overridden methods
above non-overridden methods (not sure if they should come before or after the
static method, though)

[alicet1, 2011/10/21 18:11:36]

Done.

+  virtual void Init() OVERRIDE;
+  gfx::Point GetAnchorPoint() OVERRIDE;
+
+  // WidgetDeletgate overrides:

[Daniel Erat, 2011/10/21 00:25:21]

WidgetDeletgate -> WidgetDelegate

[alicet1, 2011/10/21 18:11:36]

Done.

+  virtual void WindowClosing() OVERRIDE;
+
  protected:
   SettingLevelBubble(SkBitmap* increase_icon,
                      SkBitmap* decrease_icon,
                      SkBitmap* zero_icon);
-  virtual ~SettingLevelBubble();
 
  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.
   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
@@ skipping 15 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_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingLevelBubble);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTING_LEVEL_BUBBLE_H_