Mac: Added a delay before panels go to minimized state from title-only state.

chrome/browser/ui/panels/panel_manager.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_UI_PANELS_PANEL_MANAGER_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_MANAGER_H_
 #pragma once
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/ui/panels/auto_hiding_desktop_bar.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "ui/gfx/rect.h"
 
 class Browser;
 class Panel;
 
 // This class manages a set of panels.
 // Note that the ref count is needed by using PostTask in the implementation.
 class PanelManager : public PanelMouseWatcher::Observer,
-                     public AutoHidingDesktopBar::Observer,
-                     public base::RefCounted<PanelManager> {
+                     public AutoHidingDesktopBar::Observer {
  public:
   typedef std::vector<Panel*> Panels;
 
   // Returns a single instance.
   static PanelManager* GetInstance();
 
   virtual ~PanelManager();
 
   // Called when the display is changed, i.e. work area is updated.
   void OnDisplayChanged();
@@ skipping 57 matching lines @@
   }
 
   void enable_auto_sizing(bool enabled) {
     auto_sizing_enabled_ = enabled;
   }
 
   void SetWorkAreaForTesting(const gfx::Rect& work_area) {
     SetWorkArea(work_area);
   }
 
+  void remove_delays_for_testing() {
+    remove_delays_for_testing_ = true;
+  }
+
   int minimized_panel_count() {
     return minimized_panel_count_;
   }
 
   // Tests should disable mouse watching if mouse movements will be simulated.
   void disable_mouse_watching() {
     mouse_watching_disabled_ = true;
   }
 #endif
 
@@ skipping 31 matching lines @@
 
   // Rearranges the positions of the panels starting from the given iterator.
   // This is called when the display space has been changed, i.e. working
   // area being changed or a panel being closed.
   void Rearrange(Panels::iterator iter_to_start, int rightmost_position);
 
   // Help functions to drag the given panel.
   void DragLeft();
   void DragRight();
 
-  // Checks if the titlebars have been brought up or down. If not, do not wait
-  // for the notifications to trigger it any more, and start to bring them up or
-  // down immediately.
-  void DelayedBringUpOrDownTitlebarsCheck();
-
   // Does the real job of bringing up or down the titlebars.
   void DoBringUpOrDownTitlebars(bool bring_up);
+  // The callback for a delyed task, checks if it still need to perform
+  // the delayed action.
+  void DelayedBringUpOrDownTitlebarsCheck();
 
   int GetMaxPanelWidth() const;
   int GetMaxPanelHeight() const;
   int GetRightMostAvailablePosition() const;
 
   Panels panels_;
 
   // Stores the panels that are pending to remove. We want to delay the removal
   // when we're in the process of the dragging.
   Panels panels_pending_to_remove_;
@@ skipping 22 matching lines @@
   // the original position when we cancel the dragging.
   int dragging_panel_original_x_;
 
   // Bounds of the panel to drag. It is first set to the original bounds when
   // the dragging happens. Then it is updated to the position that will be set
   // to when the dragging ends.
   gfx::Rect dragging_panel_bounds_;
 
   scoped_refptr<AutoHidingDesktopBar> auto_hiding_desktop_bar_;
 
+  // Delayed transitions support. Sometimes transitions between minimized and
+  // title-only states are delayed, for better usability with Taskbars/Docks.
   TitlebarAction delayed_titlebar_action_;
-
-  ScopedRunnableMethodFactory<PanelManager> method_factory_;
+  bool remove_delays_for_testing_;
+  // Owned by MessageLoop after posting.
+  CancelableTask* titlebar_action_task_;
 
   // Whether or not bounds will be updated when the preferred content size is
   // changed. The testing code could set this flag to false so that other tests
   // will not be affected.
   bool auto_sizing_enabled_;
 
   bool mouse_watching_disabled_;  // For tests to simulate mouse movements.
 
   static const int kPanelsHorizontalSpacing = 4;
 
   // Minimum width and height of a panel.
   // Note: The minimum size of a widget (see widget.cc) is fixed to 100x100.
   // TODO(jianli): Need to fix this to support smaller panel.
   static const int kPanelMinWidth = 100;
   static const int kPanelMinHeight = 100;
 
   DISALLOW_COPY_AND_ASSIGN(PanelManager);
 };
 
+// Required for CancellableTask to be used with non-refcounted objects.
+// Defines empty AddRef/Release.
+DISABLE_RUNNABLE_METHOD_REFCOUNT(PanelManager);
+
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_MANAGER_H_