Support detaching/attaching panels via inter-strip drags.

chrome/browser/ui/panels/docked_panel_strip.h

 // Copyright (c) 2012 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_DOCKED_PANEL_STRIP_H_
 #define CHROME_BROWSER_UI_PANELS_DOCKED_PANEL_STRIP_H_
 #pragma once
 
 #include <list>
 #include <set>
@@ skipping 36 matching lines @@
   virtual void CloseAll() OVERRIDE;
   virtual void ResizePanelWindow(
       Panel* panel,
       const gfx::Size& preferred_window_size) OVERRIDE;
   virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
   virtual void ActivatePanel(Panel* panel) OVERRIDE;
   virtual void MinimizePanel(Panel* panel) OVERRIDE;
   virtual void RestorePanel(Panel* panel) OVERRIDE;
   virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
   virtual bool CanShowPanelAsActive(const Panel* panel) const OVERRIDE;
+  virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
+  virtual void RestorePanelToSavedPlacement() OVERRIDE;
+  virtual void DiscardSavedPanelPlacement() OVERRIDE;
   virtual bool CanDragPanel(const Panel* panel) const OVERRIDE;
-  virtual void StartDraggingPanel(Panel* panel) OVERRIDE;
-  virtual void DragPanel(Panel* panel, int delta_x, int delta_y) OVERRIDE;
-  virtual void EndDraggingPanel(Panel* panel, bool cancelled) OVERRIDE;
+  virtual void StartDraggingPanelWithinStrip(Panel* panel) OVERRIDE;
+  virtual void DragPanelWithinStrip(Panel* panel,
+                                    int delta_x,
+                                    int delta_y) OVERRIDE;
+  virtual void EndDraggingPanelWithinStrip(Panel* panel,
+                                           bool aborted) OVERRIDE;
 
   // Invoked when a panel's expansion state changes.
   void OnPanelExpansionStateChanged(Panel* panel);
 
   // Returns true if we should bring up the titlebars, given the current mouse
   // point.
   bool ShouldBringUpTitlebars(int mouse_x, int mouse_y) const;
 
   // Brings up or down the titlebars for all minimized panels.
   void BringUpOrDownTitlebars(bool bring_up);
@@ skipping 31 matching lines @@
   }
 #endif
 
  private:
   enum TitlebarAction {
     NO_ACTION,
     BRING_UP,
     BRING_DOWN
   };
 
+  struct PanelPlacement {
+    Panel* panel;
+    // Used to remember the panel to the left of |panel|, if any, for use when
+    // restoring the position of |panel|. Will be updated if this panel is
+    // closed.

[jennb, 2012/03/08 23:41:09]

or moved out of the dock (e.g. to overflow).

[jianli, 2012/03/09 21:48:58]

Done.

+    Panel* left_panel_;
+
+    PanelPlacement() : panel(NULL) { }
+  };
+
   // Overridden from PanelMouseWatcherObserver:
   virtual void OnMouseMove(const gfx::Point& mouse_position) OVERRIDE;
 
+  // Helper methods to put the panel to the collection.
+  void InsertPreviewedPanel(Panel* panel);
+  void InsertExistingPanel(Panel* panel);
+  void InsertNewlyCreatedPanel(Panel* panel);
+
+  // Ensures that there is sufficient space in the strip to add a panel with
+  // the specified width. We might need to bump panels in the strip to make
+  // room for this panel.
+  void EnsureAvailableSpace(int width);

[jennb, 2012/03/08 23:41:09]

Should not need this now that you've synced to latest code.

[jianli, 2012/03/09 21:48:58]

Done.

+
   // Keep track of the minimized panels to control mouse watching.
   void IncrementMinimizedPanels();
   void DecrementMinimizedPanels();
 
   // Help functions to drag the given panel.
   void DragLeft(Panel* dragging_panel);
   void DragRight(Panel* dragging_panel);
 
   // 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 GetRightMostAvailablePosition() const;
 
   // Determines position in strip where a panel of |width| will fit.
   // Other panels in the strip may be moved to overflow to make room.
   // Returns x position where a panel of |width| wide can fit.
   // |width| is in screen coordinates.
   int FitPanelWithWidth(int width);
 
   // Called by AddPanel() after a delay to move a newly created panel from
   // the panel strip to overflow because the panel could not fit
   // within the bounds of the panel strip. New panels are first displayed
   // in the panel strip, then moved to overflow so that all created
   // panels are (at least briefly) visible before entering overflow.
   void DelayedMovePanelToOverflow(Panel* panel);
 
-  Panel* dragging_panel() const;
-
   PanelManager* panel_manager_;  // Weak, owns us.
 
   // All panels in the panel strip must fit within this area.
   gfx::Rect display_area_;
 
   Panels panels_;
 
   // Stores newly created panels that have a temporary layout until they
   // are moved to overflow after a delay.
   std::set<Panel*> panels_in_temporary_layout_;
 
   int minimized_panel_count_;
   bool are_titlebars_up_;
 
   // Referring to current position in |panels_| where the dragging panel
   // resides.
   Panels::iterator dragging_panel_current_iterator_;
 
-  // Referring to original position in |panels_| where the dragging panel
-  // resides.
-  Panels::iterator dragging_panel_original_iterator_;
-
   // Delayed transitions support. Sometimes transitions between minimized and
   // title-only states are delayed, for better usability with Taskbars/Docks.
   TitlebarAction delayed_titlebar_action_;
 
   // Owned by MessageLoop after posting.
   base::WeakPtrFactory<DockedPanelStrip> titlebar_action_factory_;
 
+  // Used to save the placement information for a panel.
+  PanelPlacement saved_panel_placement_;
+
   static const int kPanelsHorizontalSpacing = 4;
 
   // Absolute minimum width and height for panels, including non-client area.
   // Should only be big enough to accomodate a close button on the reasonably
   // recognisable titlebar.
   static const int kPanelMinWidth;
   static const int kPanelMinHeight;
 
   DISALLOW_COPY_AND_ASSIGN(DockedPanelStrip);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_DOCKED_PANEL_STRIP_H_