Make panel adjust bounds per preferred size change notification on Windows.

chrome/browser/ui/panels/panel_browser_view.cc

 // 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.
 
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ skipping 22 matching lines @@
   PanelBrowserView* view = new PanelBrowserView(browser, panel, bounds);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }
 
 PanelBrowserView::PanelBrowserView(Browser* browser, Panel* panel,
                                    const gfx::Rect& bounds)
   : BrowserView(browser),
     panel_(panel),
     bounds_(bounds),
-    original_height_(bounds.height()),
+    restored_height_(bounds.height()),
     closed_(false),
     focused_(false),
     mouse_pressed_(false),
     mouse_dragging_(false),
     is_drawing_attention_(false) {
 }
 
 PanelBrowserView::~PanelBrowserView() {
 }
 
@@ skipping 25 matching lines @@
 bool PanelBrowserView::CanResize() const {
   return false;
 }
 
 bool PanelBrowserView::CanMaximize() const {
   return false;
 }
 
 void PanelBrowserView::SetBounds(const gfx::Rect& bounds) {
   bounds_ = bounds;
+  if (panel_->expansion_state() == Panel::EXPANDED)
+    restored_height_ = bounds.height();
 
   //// No animation if the panel is being dragged.
   if (mouse_dragging_) {
     ::BrowserView::SetBounds(bounds);
     return;
   }
 
   animation_start_bounds_ = GetBounds();
 
   if (!bounds_animator_.get()) {
@@ skipping 84 matching lines @@
 
 void PanelBrowserView::SetPanelBounds(const gfx::Rect& bounds) {
   SetBounds(bounds);
 }
 
 void PanelBrowserView::OnPanelExpansionStateChanged(
     Panel::ExpansionState expansion_state) {
   int height;
   switch (expansion_state) {
     case Panel::EXPANDED:
-      height = original_height_;
+      height = restored_height_;
       break;
     case Panel::TITLE_ONLY:
       height = GetFrameView()->NonClientTopBorderHeight();
       break;
     case Panel::MINIMIZED:
       height = kFullyMinimizedHeight;
 
       // Start the mouse watcher so that we can bring up the minimized panels.
       // TODO(jianli): Need to support mouse watching in ChromeOS.
 #if defined(OS_WIN)
       EnsureMouseWatcherStarted();
 #endif
       break;
     default:
       NOTREACHED();
-      height = original_height_;
+      height = restored_height_;
       break;
   }
 
   gfx::Rect bounds = bounds_;
   bounds.set_y(bounds.y() + bounds.height() - height);
   bounds.set_height(height);
   SetBounds(bounds);
 }
 
 bool PanelBrowserView::ShouldBringUpPanelTitleBar(int mouse_x,
@@ skipping 74 matching lines @@
   // user clicks on it to mean to clear the attention.
   attention_cleared_time_ = base::TimeTicks::Now();
 
   // Bring up the title bar.
   if (panel_->expansion_state() == Panel::TITLE_ONLY)
     panel_->SetExpansionState(Panel::EXPANDED);
 
   GetFrameView()->SchedulePaint();
 }
 
+gfx::Size PanelBrowserView::GetNonClientAreaSize() const {
+  return GetFrameView()->NonClientAreaSize();
+}
+
+int PanelBrowserView::GetRestoredHeight() const {
+  return restored_height_;
+}
+
+void PanelBrowserView::SetRestoredHeight(int height) {
+  restored_height_ = height;
+}
+
 Browser* PanelBrowserView::GetPanelBrowser() const {
   return browser();
 }
 
 void PanelBrowserView::DestroyPanelBrowser() {
   DestroyBrowser();
 }
 
 NativePanelTesting* PanelBrowserView::GetNativePanelTesting() {
   return this;
@@ skipping 56 matching lines @@
   if (!mouse_pressed_)
     return false;
   mouse_pressed_ = false;
 
   if (!mouse_dragging_)
     cancelled = true;
   mouse_dragging_ = false;
   panel_->manager()->EndDragging(cancelled);
   return true;
 }