[Views, WebIntents] Enable auto-resizing for WebContents

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 668 matching lines @@
   virtual int GetDialogButtons() const OVERRIDE;
 
   // LinkListener implementation.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // WebIntentPicker implementation.
   virtual void Close() OVERRIDE;
   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;
 
   // WebIntentPickerModelObserver implementation.
   virtual void OnModelChanged(WebIntentPickerModel* model) OVERRIDE;
   virtual void OnFaviconChanged(WebIntentPickerModel* model,
                                 size_t index) OVERRIDE;
   virtual void OnExtensionIconChanged(WebIntentPickerModel* model,
                                       const string16& extension_id) OVERRIDE;
   virtual void OnInlineDisposition(WebIntentPickerModel* model,
@@ skipping 179 matching lines @@
 
 void WebIntentPickerViews::OnExtensionInstallFailure(const std::string& id) {
   service_buttons_->SetEnabled(true);
   extensions_->StopThrobber();
   more_suggestions_link_->SetEnabled(true);
   contents_->Layout();
 
   // 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_)
     return;
 
   // Replace the picker with the inline disposition.
   contents_->RemoveAllChildViews(true);
   more_suggestions_link_ = NULL;
 
   views::GridLayout* grid_layout = new views::GridLayout(contents_);
@@ skipping 10 matching lines @@
   header_cs->AddPaddingColumn(0, 4);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Link.
   header_cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
 #if defined(USE_CLOSE_BUTTON)
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Close Button.
 #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 =
       model_->GetInstalledServiceWithURL(model_->inline_disposition_url());
 
   // Header row.
   grid_layout->StartRow(0, 0);
   views::ImageView* icon = new views::ImageView();
   icon->SetImage(service->favicon.ToSkBitmap());
   grid_layout->AddView(icon);
 
   string16 elided_title = ui::ElideText(
       service->title, gfx::Font(), kTitleLinkMaxWidth, ui::ELIDE_AT_END);
   views::Label* title = new views::Label(elided_title);
   grid_layout->AddView(title);
 
   choose_another_service_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE));
   grid_layout->AddView(choose_another_service_link_);
   choose_another_service_link_->set_listener(this);
 
 #if defined(USE_CLOSE_BUTTON)
   grid_layout->AddView(CreateCloseButton());
 #endif
 
   // 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;
 }
 
 void WebIntentPickerViews::OnModelChanged(WebIntentPickerModel* model) {
   suggestions_label_->SetText(l10n_util::GetStringUTF16(
       model->GetInstalledServiceCount() ?
           IDS_INTENT_PICKER_GET_MORE_SERVICES :
           IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED));
@@ skipping 183 matching lines @@
   contents_->Layout();
   SizeToContents();
 
 }
 
 void WebIntentPickerViews::SizeToContents() {
   gfx::Size client_size = contents_->GetPreferredSize();
   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)
 views::ImageButton* WebIntentPickerViews::CreateCloseButton() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   return close_button;
 }
 #endif