Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel.cc

 // 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.
 
 #include "chrome/browser/ui/panels/panel.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 30 matching lines @@
       web_app::GetExtensionIdFromApplicationName(browser->app_name()), false);
 }
 
 Panel::Panel(Browser* browser, const gfx::Size& requested_size)
     : browser_(browser),
       initialized_(false),
       has_temporary_layout_(false),
       restored_size_(requested_size),
       auto_resizable_(false),
       draggable_(true),
+      layout_state_(DOCKED),
       expansion_state_(EXPANDED),
-      old_expansion_state_(EXPANDED),
       app_icon_visible_(true) {
 }
 
 Panel::~Panel() {
   // Invoked by native panel destructor. Do not access native_panel_ here.
 }
 
 void Panel::Initialize(const gfx::Rect& bounds) {
   DCHECK(!initialized_);
   DCHECK(!bounds.IsEmpty());
   initialized_ = true;
   native_panel_ = CreateNativePanel(browser_, this, bounds);
 }
 
 void Panel::OnNativePanelClosed() {
   if (auto_resizable_)
     native_panel_->GetPanelBrowser()->tabstrip_model()->RemoveObserver(this);
   manager()->Remove(this);
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 const Extension* Panel::GetExtension() const {
   return GetExtensionFromBrowser(browser());
 }
 
 void Panel::SetPanelBounds(const gfx::Rect& bounds) {
-  if (expansion_state_ == Panel::EXPANDED)
+  if (layout_state_ != IN_OVERFLOW && expansion_state_ == EXPANDED)
     restored_size_ = bounds.size();
 
   native_panel_->SetPanelBounds(bounds);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_BOUNDS,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
 void Panel::SetPanelBoundsInstantly(const gfx::Rect& bounds) {
-  if (expansion_state_ == Panel::EXPANDED)
+  if (layout_state_ != IN_OVERFLOW && expansion_state_ == EXPANDED)
     restored_size_ = bounds.size();
 
   native_panel_->SetPanelBoundsInstantly(bounds);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_BOUNDS,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
@@ skipping 25 matching lines @@
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::SetAppIconVisibility(bool visible) {
   if (app_icon_visible_ == visible)
     return;
   app_icon_visible_ = visible;
   native_panel_->SetPanelAppIconVisibility(visible);
 }
 
+void Panel::SetLayoutState(LayoutState new_state) {
+  if (layout_state_ == new_state)
+    return;
+  LayoutState old_state = layout_state_;
+  layout_state_ = new_state;
+
+  manager()->OnPanelLayoutStateChanged(this, old_state);
+
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_STATE,
+      content::Source<Panel>(this),
+      content::NotificationService::NoDetails());
+}
+
 void Panel::SetExpansionState(ExpansionState new_state) {
+  DCHECK_EQ(DOCKED, layout_state_);
+
   if (expansion_state_ == new_state)
     return;
-  old_expansion_state_ = expansion_state_;
+  ExpansionState old_state = expansion_state_;
   expansion_state_ = new_state;
 
-  manager()->OnPanelExpansionStateChanged(this);
+  manager()->OnPanelExpansionStateChanged(this, old_state);
 
   // The minimized panel should not get the focus.
-  if (expansion_state_ == MINIMIZED)
+  if (expansion_state_ == MINIMIZED && layout_state_ == DOCKED)
     Deactivate();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
 bool Panel::IsDrawingAttention() const {
   return native_panel_->IsDrawingAttention();
 }
 
 void Panel::FullScreenModeChanged(bool is_full_screen) {
   native_panel_->FullScreenModeChanged(is_full_screen);
 }
 
 void Panel::Show() {
   // Don't show panel as active if it is in overflow state.
-  if (expansion_state_ == IN_OVERFLOW)
+  if (layout_state_ == IN_OVERFLOW)
     ShowInactive();
   else
     native_panel_->ShowPanel();
 }
 
 void Panel::ShowInactive() {
   native_panel_->ShowPanelInactive();
 }
 
 void Panel::SetBounds(const gfx::Rect& bounds) {
   // Ignore bounds position as the panel manager controls all positioning.
   manager()->ResizePanel(this, bounds.size());
 }
 
 // Close() may be called multiple times if the browser window is not ready to
 // close on the first attempt.
 void Panel::Close() {
   native_panel_->ClosePanel();
 }
 
 void Panel::Activate() {
   // Make sure the panel is expanded when activated programmatically,
   // so the user input does not go into collapsed window.
+  SetLayoutState(Panel::DOCKED);
   SetExpansionState(Panel::EXPANDED);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
   native_panel_->DeactivatePanel();
 }
 
 bool Panel::IsActive() const {
   return native_panel_->IsPanelActive();
@@ skipping 443 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }