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 19 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 24 matching lines @@
 
 bool PanelBrowserView::CanResize() const {
   return false;
 }
 
 bool PanelBrowserView::CanMaximize() const {
   return false;
 }
 
 void PanelBrowserView::SetBounds(const gfx::Rect& bounds) {
+  if (bounds_ == bounds)
+    return;
   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()) {
     bounds_animator_.reset(new ui::SlideAnimation(this));
@@ skipping 83 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 = PanelBrowserFrameView::MinimizedPanelHeight();
 
       // 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;
   }
 
   int bottom = panel_->manager()->GetBottomPositionForExpansionState(
       expansion_state);
   gfx::Rect bounds = bounds_;
   bounds.set_y(bottom - height);
   bounds.set_height(height);
   SetBounds(bounds);
 }
@@ skipping 87 matching lines @@
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   return PreHandleKeyboardEvent(event, is_keyboard_shortcut);
 }
 
 void PanelBrowserView::HandlePanelKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   HandleKeyboardEvent(event);
 }
 
+gfx::Size PanelBrowserView::GetNonClientAreaExtent() 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();
 }
 
 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const {
   return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView());
@@ skipping 105 matching lines @@
       panel_browser_view_->mouse_pressed_point_.y() + delta_y));
 }
 
 void NativePanelTestingWin::CancelDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseCaptureLost();
 }
 
 void NativePanelTestingWin::FinishDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseReleased();
 }