Move extension pop-ups and notifications to the new auto-resize code.

chrome/browser/ui/views/extensions/extension_view.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/views/extensions/extension_view.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
+#include "chrome/common/chrome_view_type.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/views/widget/widget.h"
 
 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
     : host_(host),
       browser_(browser),
@@ skipping 63 matching lines @@
 }
 
 void ExtensionView::ShowIfCompletelyLoaded() {
   if (visible() || is_clipped_)
     return;
 
   // We wait to show the ExtensionView until it has loaded, and the view has
   // actually been created. These can happen in different orders.
   if (host_->did_stop_loading()) {
     SetVisible(true);
-    UpdatePreferredSize(pending_preferred_size_);
+    ResizeDueToAutoResize(pending_preferred_size_);
   }
 }
 
 void ExtensionView::CleanUp() {
   if (!initialized_)
     return;
   if (native_view())
     Detach();
   initialized_ = false;
 }
 
 void ExtensionView::SetBackground(const SkBitmap& background) {
   if (render_view_host()->IsRenderViewLive() && render_view_host()->GetView()) {
     render_view_host()->GetView()->SetBackground(background);
   } else {
     pending_background_ = background;
   }
   ShowIfCompletelyLoaded();
 }
 
-void ExtensionView::UpdatePreferredSize(const gfx::Size& new_size) {
+void ExtensionView::ResizeDueToAutoResize(const gfx::Size& new_size) {
   // Don't actually do anything with this information until we have been shown.
   // Size changes will not be honored by lower layers while we are hidden.
   if (!visible()) {
     pending_preferred_size_ = new_size;
     return;
   }
 
   gfx::Size preferred_size = GetPreferredSize();
   if (new_size != preferred_size)
     SetPreferredSize(new_size);
 }
 
 void ExtensionView::ViewHierarchyChanged(bool is_add,
                                          views::View *parent,
                                          views::View *child) {
   NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && GetWidget() && !initialized_)
     CreateWidgetHostView();
 }
 
 void ExtensionView::PreferredSizeChanged() {
   View::PreferredSizeChanged();
   if (container_)
-    container_->OnExtensionPreferredSizeChanged(this);
+    container_->OnExtensionSizeChanged(this);
 }
 
 bool ExtensionView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   // Let the tab key event be processed by the renderer (instead of moving the
   // focus to the next focusable view). Also handle Backspace, since otherwise
   // (on Windows at least), pressing Backspace, when focus is on a text field
   // within the ExtensionView, will navigate the page back instead of erasing a
   // character.
   return (e.key_code() == ui::VKEY_TAB || e.key_code() == ui::VKEY_BACK);
 }
 
 void ExtensionView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Propagate the new size to RenderWidgetHostView.
   // We can't send size zero because RenderWidget DCHECKs that.
   if (render_view_host()->GetView() && !bounds().IsEmpty()) {
     render_view_host()->GetView()->SetSize(size());
 
     if (container_)
       container_->OnViewWasResized();
   }
 }
 
 void ExtensionView::RenderViewCreated() {
   if (!pending_background_.empty() && render_view_host()->GetView()) {
     render_view_host()->GetView()->SetBackground(pending_background_);
     pending_background_.reset();
   }
 
-  // Tell the renderer not to draw scroll bars in popups unless the
-  // popups are at the maximum allowed size.
-  gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth,
-                               ExtensionPopup::kMaxHeight);
-  host_->DisableScrollbarsForSmallWindows(largest_popup_size);
+  content::ViewType host_type = host_->extension_host_type();
+  if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) {
+    gfx::Size min_size(ExtensionPopup::kMinWidth,
+                       ExtensionPopup::kMinHeight);
+    gfx::Size max_size(ExtensionPopup::kMaxWidth,
+                       ExtensionPopup::kMaxHeight);
+    render_view_host()->EnableAutoResize(min_size, max_size);
+  }
 
   if (container_)
     container_->OnViewWasResized();
 }