Change panels to be able to turn off autoresize.

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 101 matching lines @@
       chrome::NOTIFICATION_PANEL_CHANGED_BOUNDS,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
 void Panel::SetAutoResizable(bool resizable) {
   if (auto_resizable_ == resizable)
     return;
 
   auto_resizable_ = resizable;
+  WebContents* web_contents = browser()->GetSelectedWebContents();
   if (auto_resizable_) {
     browser()->tabstrip_model()->AddObserver(this);
-    WebContents* web_contents = browser()->GetSelectedWebContents();
     if (web_contents)
       EnableWebContentsAutoResize(web_contents);
   } else {
     browser()->tabstrip_model()->RemoveObserver(this);
     registrar_.RemoveAll();
+
+    if (web_contents) {
+      // NULL might be returned if the tab has not been added.
+      RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
+      if (render_view_host)
+        render_view_host->DisableAutoResize(restored_size_);
+    }
   }
 }
 
 void Panel::SetSizeRange(const gfx::Size& min_size, const gfx::Size& max_size) {
   if (min_size == min_size_ && max_size == max_size_)
     return;
 
   DCHECK(min_size.width() <= max_size.width());
   DCHECK(min_size.height() <= max_size.height());
   min_size_ = min_size;
@@ skipping 473 matching lines @@
 #if defined(OS_CHROMEOS)
 void Panel::ShowMobileSetup() {
   NOTIMPLEMENTED();
 }
 
 void Panel::ShowKeyboardOverlay(gfx::NativeWindow owning_window) {
   NOTIMPLEMENTED();
 }
 #endif
 
-void Panel::UpdatePreferredSize(WebContents* web_contents,
-                                const gfx::Size& pref_size) {
-  if (auto_resizable_) {
-    return manager()->OnPreferredWindowSizeChanged(this,
-        native_panel_->WindowSizeFromContentSize(pref_size));
-  }
+void Panel::ResizeDueToAutoResize(WebContents* web_contents,
+                                  const gfx::Size& pref_size) {
+  DCHECK(auto_resizable_);
+  return manager()->OnWindowAutoResized(
+      this,
+      native_panel_->WindowSizeFromContentSize(pref_size));
 }
 
 void Panel::ShowAvatarBubble(WebContents* web_contents, const gfx::Rect& rect) {
   // Panels will never show a new tab page so this should never be called.
   NOTREACHED();
 }
 
 void Panel::ShowAvatarBubbleFromAvatarButton() {
   // Panels will never show an avatar button so this should never be called.
   NOTREACHED();
@@ skipping 42 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }