[Views, WebIntents] Enable auto-resizing for WebContents

R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10388203

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138297 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/web_intent_picker_views.cc

@@ -686,6 +686,7 @@ class WebIntentPickerViews : public views::ButtonListener,
   virtual void SetActionString(const string16& action) OVERRIDE;
   virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE;
   virtual void OnExtensionInstallFailure(const std::string& id) OVERRIDE;
+  virtual void OnInlineDispositionAutoResize(const gfx::Size& size) OVERRIDE;
   virtual void OnInlineDispositionWebContentsLoaded(
       content::WebContents* web_contents) OVERRIDE;
 
@@ -885,6 +886,13 @@ void WebIntentPickerViews::OnExtensionInstallFailure(const std::string& id) {
   // TODO(binji): What to display to user on failure?
 }
 
+void WebIntentPickerViews::OnInlineDispositionAutoResize(
+    const gfx::Size& size) {
+  webview_->SetPreferredSize(size);
+  contents_->Layout();
+  SizeToContents();
+}
+
 void WebIntentPickerViews::OnInlineDispositionWebContentsLoaded(
     content::WebContents* web_contents) {
   if (displaying_web_contents_)
@@ -915,7 +923,7 @@ void WebIntentPickerViews::OnInlineDispositionWebContentsLoaded(
 #endif
 
   views::ColumnSet* full_cs = grid_layout->AddColumnSet(1);
-  full_cs->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
+  full_cs->AddColumn(GridLayout::FILL, GridLayout::FILL, 1.0,
                      GridLayout::USE_PREF, 0, 0);
 
   const WebIntentPickerModel::InstalledService* service =
@@ -944,7 +952,7 @@ void WebIntentPickerViews::OnInlineDispositionWebContentsLoaded(
   // Inline web contents row.
   grid_layout->StartRow(0, 1);
   grid_layout->AddView(webview_, 1, 1, GridLayout::CENTER,
-                       GridLayout::CENTER, kDialogMinWidth, 140);
+                       GridLayout::CENTER, 0, 0);
   contents_->Layout();
   SizeToContents();
   displaying_web_contents_ = true;
@@ -1148,8 +1156,7 @@ void WebIntentPickerViews::SizeToContents() {
   gfx::Rect client_bounds(client_size);
   gfx::Rect new_window_bounds = window_->non_client_view()->frame_view()->
       GetWindowBoundsForClientBounds(client_bounds);
-  // TODO(binji): figure out how to get the constrained dialog centered...
-  window_->SetSize(new_window_bounds.size());
+  window_->CenterWindow(new_window_bounds.size());
 }
 
 #if defined(USE_CLOSE_BUTTON)

ui/views/controls/webview/webview.cc

@@ -79,6 +79,10 @@ void WebView::OnWebContentsFocused(content::WebContents* web_contents) {
     focus_manager->SetFocusedView(this);
 }
 
+void WebView::SetPreferredSize(const gfx::Size& preferred_size) {
+  preferred_size_ = preferred_size;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, View overrides:
 
@@ -137,6 +141,13 @@ gfx::NativeViewAccessible WebView::GetNativeViewAccessible() {
   return View::GetNativeViewAccessible();
 }
 
+gfx::Size WebView::GetPreferredSize() {
+  if (preferred_size_ == gfx::Size())
+    return View::GetPreferredSize();
+  else
+    return preferred_size_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, content::NotificationObserver implementation:
 

ui/views/controls/webview/webview.h

@@ -70,6 +70,10 @@ class VIEWS_EXPORT WebView : public View,
     allow_accelerators_ = allow_accelerators;
   }
 
+  // Sets the preferred size. If empty, View's implementation of
+  // GetPreferredSize() is used.
+  void SetPreferredSize(const gfx::Size& preferred_size);
+
   // Overridden from View:
   virtual std::string GetClassName() const OVERRIDE;
 
@@ -86,6 +90,7 @@ class VIEWS_EXPORT WebView : public View,
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
@@ -115,6 +120,7 @@ class VIEWS_EXPORT WebView : public View,
   content::BrowserContext* browser_context_;
   content::NotificationRegistrar registrar_;
   bool allow_accelerators_;
+  gfx::Size preferred_size_;
 
   DISALLOW_COPY_AND_ASSIGN(WebView);
 };