Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel.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_PANEL_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_H_
 #pragma once
 
 #include "chrome/browser/ui/browser_window.h"
 
@@ skipping 14 matching lines @@
 // - Throw an exceptions.  The function shouldn't be called for Panels.
 // - Do Panel specific platform independent processing and then invoke the
 //   function on the platform specific BrowserWindow member.  For example,
 //   Panel size is restricted to certain limits.
 // - Invoke an appropriate PanelManager function to do stuff that might affect
 //   other Panels.  For example deleting a panel would rearrange other panels.
 class Panel : public BrowserWindow,
               public TabStripModelObserver,
               public content::NotificationObserver {
  public:
+  enum StripOwner {

[jennb, 2012/01/19 18:14:26]

PanelLayout? More informative than StripOwner.

[jianli, 2012/01/19 22:24:41]

Renamed to LayoutState, per discussion.

+    // The panel is docked to the bottom of the screen. The user might only be

[jennb, 2012/01/19 18:14:26]

For this comment and the next, I would drop the second sentence describing what
the user can/cannot do.

[jianli, 2012/01/19 22:24:41]

Done.

+    // able to resize the panel.
+    DOCKED,
+    // The panel can appear anywhere on the screen. The user can resize or
+    // reposition the panel at will.
+    DETACHED,
+    // The panel is put into the overflow area due to no space available in the

[jennb, 2012/01/19 18:14:26]

s/no space available/insufficient space

[jianli, 2012/01/19 22:24:41]

Done.

+    // normal display area.

[jennb, 2012/01/19 18:14:26]

s/normal/docked

"normal" is vague and open to interpretation.

[jianli, 2012/01/19 22:24:41]

Done.

+    IN_OVERFLOW
+  };
+
   enum ExpansionState {
-   // The panel is fully expanded with both title-bar and the client-area.
-   EXPANDED,
-   // The panel is shown with the title-bar only.
-   TITLE_ONLY,
-   // The panel is shown with 3-pixel line.
-   MINIMIZED,
-   // The panel is put into the overflow area due to no space available in the
-   // normal display area.
-   IN_OVERFLOW
+    // The panel is fully expanded with both title-bar and the client-area.
+    EXPANDED,
+    // The panel is shown with the title-bar only.
+    TITLE_ONLY,
+    // The panel is shown with 3-pixel line.
+    MINIMIZED
   };
 
   // The panel can be minimized to 4-pixel lines.
   static const int kMinimizedPanelHeight = 4;
 
   virtual ~Panel();
 
   // Returns the PanelManager associated with this panel.
   PanelManager* manager() const;
 
   // Gets the extension that a panel is created from.
   // Returns NULL if it cannot be found.
   const Extension* GetExtension() const;
 
+  void SetStripOwner(StripOwner new_strip_owner);
   void SetExpansionState(ExpansionState new_expansion_state);
 
   bool IsDrawingAttention() const;
 
   // This function will only get called by PanelManager when full screen mode
   // changes i.e it gets called when an app goes into full screen mode or when
   // an app exits full screen mode. Panel should respond by making sure
   // a) it does not go on top when some app enters full screen mode.
   // b) it remains on top when an app exits full screen mode.
   void FullScreenModeChanged(bool is_full_screen);
@@ skipping 142 matching lines @@
 
   // Used on platforms where the panel cannot determine its window size
   // until the window has been created. (e.g. GTK)
   void OnWindowSizeAvailable();
 
   // Asynchronous completion of panel close request.
   void OnNativePanelClosed();
 
   NativePanel* native_panel() { return native_panel_; }
   Browser* browser() const { return browser_; }
+  StripOwner strip_owner() const { return strip_owner_; }
   ExpansionState expansion_state() const { return expansion_state_; }
-  ExpansionState old_expansion_state() const { return old_expansion_state_; }
   const gfx::Size& min_size() const { return min_size_; }
   const gfx::Size& max_size() const { return max_size_; }
   bool auto_resizable() const { return auto_resizable_; }
 
   bool draggable() const { return draggable_; }
   void set_draggable(bool can_drag) { draggable_ = can_drag; }
 
   // The restored size is the size of the panel when it is expanded.
   gfx::Size restored_size() const { return restored_size_; }
   void set_restored_size(const gfx::Size& size) { restored_size_ = size; }
@@ skipping 70 matching lines @@
   // True if this panel auto resizes based on content.
   bool auto_resizable_;
 
   // True if this panel can be dragged.
   bool draggable_;
 
   // Platform specifc implementation for panels.  It'd be one of
   // PanelBrowserWindowGtk/PanelBrowserView/PanelBrowserWindowCocoa.
   NativePanel* native_panel_;  // Weak, owns us.
 
+  StripOwner strip_owner_;
   ExpansionState expansion_state_;
-  ExpansionState old_expansion_state_;
 
   // Indicates whether the panel app icon is visible in the taskbar.
   bool app_icon_visible_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(Panel);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_H_