[Web Intents] Display throbber when loading inline disposition.

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/time.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/theme_resources.h"
+#include "grit/ui_resources.h"
 #include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/text_button.h"
@@ skipping 29 matching lines @@
 
 // The maximum width in pixels of a suggested extension's title link.
 const int kTitleLinkMaxWidth = 130;
 
 // The color used to dim disabled elements.
 const SkColor kHalfOpacityWhite = SkColorSetARGB(128, 255, 255, 255);
 
 // The color used to display a disabled link.
 const SkColor kDisabledLinkColor = SkColorSetRGB(128, 128, 128);
 
+// The time between successive throbber frames in milliseconds.
+const int kThrobberFrameTimeMs = 60;
+
 // Enables or disables all child views of |view|.
 void EnableChildViews(views::View* view, bool enabled) {
   for (int i = 0; i < view->child_count(); ++i) {
     views::View* child = view->child_at(i);
     child->SetEnabled(enabled);
   }
 }
 
 // StarsView -------------------------------------------------------------------
 
@@ skipping 29 matching lines @@
   // TODO(binji): Add tooltip with text rating
   // "Average Rating: X.XX stars (YYYYY)"
   // Y = "1: Hated it, 2: Disliked it, 3: It was okay, 4: Liked it,
   //      5: Loved it"
   // Choose Y based on rounded X.
 }
 
 StarsView::~StarsView() {
 }
 
+// ThrobberNativeTextButton ----------------------------------------------------
+
+// A native text button that can display a throbber in place of its icon. Much
+// of the logic of this class is copied from ui/views/controls/throbber.h.
+class ThrobberNativeTextButton : public views::NativeTextButton {
+ public:
+  ThrobberNativeTextButton(views::ButtonListener* listener,
+                           const string16& text);
+  ~ThrobberNativeTextButton();

[sky, 2012/04/13 21:36:16]

virtual

[binji, 2012/04/13 22:27:33]

Done.

+
+  // Start or stop the throbber.
+  void StartThrobber();
+  void StopThrobber();
+
+  // Set the throbber bitmap to use. IDR_THROBBER is used by default.
+  void SetFrames(const SkBitmap* frames);
+
+ protected:
+  virtual const SkBitmap& GetImageToPaint() const OVERRIDE;
+
+ private:
+  // The timer callback to schedule painting this view.
+  void Run();
+
+  // Bitmap that contains the throbber frames.
+  const SkBitmap* frames_;
+
+  // The currently displayed frame, given to GetImageToPaint.
+  mutable SkBitmap this_frame_;
+
+  // How long one frame is displayed.
+  base::TimeDelta frame_time_;
+
+  // Used to schedule Run calls.
+  base::RepeatingTimer<ThrobberNativeTextButton> timer_;
+
+  // How many frames we have.
+  int frame_count_;
+
+  // Time when StartThrobber was called.
+  base::Time start_time_;

[sky, 2012/04/13 21:36:16]

Use TimeTicks.

[binji, 2012/04/13 22:27:33]

Done.

+
+  // Whether the throbber is shown an animating.
+  bool running_;
+};

[sky, 2012/04/13 21:36:16]

DISALLOW_

[binji, 2012/04/13 22:27:33]

Done.

+
+ThrobberNativeTextButton::ThrobberNativeTextButton(
+    views::ButtonListener* listener, const string16& text)
+    : NativeTextButton(listener, text),
+      frame_time_(base::TimeDelta::FromMilliseconds(kThrobberFrameTimeMs)),
+      frame_count_(0),
+      running_(false) {
+  SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+      IDR_THROBBER).ToSkBitmap());
+}
+
+ThrobberNativeTextButton::~ThrobberNativeTextButton() {
+  StopThrobber();
+}
+
+void ThrobberNativeTextButton::StartThrobber() {
+  if (running_)
+    return;
+
+  start_time_ = base::Time::Now();
+  timer_.Start(FROM_HERE, frame_time_ - base::TimeDelta::FromMilliseconds(10),

[sky, 2012/04/13 21:36:16]

Why the -10ms here?

[binji, 2012/04/13 22:27:33]

Not sure, this was copy/paste from views/controls/throbber.cc
I'll remove it.

+               this, &ThrobberNativeTextButton::Run);
+  running_ = true;
+
+  SchedulePaint();
+}
+
+void ThrobberNativeTextButton::StopThrobber() {
+  if (!running_)
+    return;
+
+  timer_.Stop();
+  running_ = false;
+}
+
+void ThrobberNativeTextButton::SetFrames(const SkBitmap* frames) {
+  frames_ = frames;
+  DCHECK(frames_->width() > 0 && frames_->height() > 0);
+  DCHECK(frames_->width() % frames_->height() == 0);
+  frame_count_ = frames_->width() / frames_->height();
+  PreferredSizeChanged();
+}
+
+const SkBitmap& ThrobberNativeTextButton::GetImageToPaint() const {
+  if (!running_)
+    return NativeTextButton::GetImageToPaint();
+
+  const base::TimeDelta elapsed_time = base::Time::Now() - start_time_;
+  const int current_frame =
+    static_cast<int>(elapsed_time / frame_time_) % frame_count_;

[sky, 2012/04/13 21:36:16]

nit: indent 4

[binji, 2012/04/13 22:27:33]

Done.

+  const int image_size = frames_->height();
+  const int image_offset = current_frame * image_size;
+
+  SkIRect subset_rect = SkIRect::MakeXYWH(image_offset, 0,
+                                          image_size, image_size);
+  frames_->extractSubset(&this_frame_, subset_rect);
+  return this_frame_;
+}
+
+void ThrobberNativeTextButton::Run() {
+  DCHECK(running_);
+
+  SchedulePaint();
+}
+
 // ServiceButtonsView ----------------------------------------------------------
 
 // A view that contains all service buttons (i.e. the installed services).
 class ServiceButtonsView : public views::View,
                            public views::ButtonListener {
  public:
   class Delegate {
    public:
     // Called when a service button is clicked. |index| is the index of the
     // service button in the model.
     virtual void OnServiceButtonClicked(
         const WebIntentPickerModel::InstalledService& service) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   ServiceButtonsView(const WebIntentPickerModel* model, Delegate* delegate);
   virtual ~ServiceButtonsView();
 
   // Updates the service button view with new model data.
   void Update();
 
+  // Start a throbber on the service button that will launch the service at
+  // |url|.
+  void StartThrobber(const GURL& url);
+
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE;
 
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
   virtual void OnEnabledChanged() OVERRIDE;
 
  private:
@@ skipping 26 matching lines @@
   cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, GridLayout::USE_PREF,
                 0, 0);
   cs->AddPaddingColumn(1, 0);
 
   for (size_t i = 0; i < model_->GetInstalledServiceCount(); ++i) {
     const WebIntentPickerModel::InstalledService& service =
         model_->GetInstalledServiceAt(i);
 
     grid_layout->StartRow(0, 0);
 
-    views::NativeTextButton* button =
-        new views::NativeTextButton(this, service.title);
+    ThrobberNativeTextButton* button =
+        new ThrobberNativeTextButton(this, service.title);
     button->set_alignment(views::TextButton::ALIGN_LEFT);
     button->SetTooltipText(UTF8ToUTF16(service.url.spec().c_str()));
     button->SetIcon(*service.favicon.ToSkBitmap());
     button->set_tag(static_cast<int>(i));
     grid_layout->AddView(button);
     grid_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   // Additional space to separate the buttons from the suggestions.
   grid_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
+void ServiceButtonsView::StartThrobber(const GURL& url) {
+  for (size_t i = 0; i < model_->GetInstalledServiceCount(); ++i) {
+    const WebIntentPickerModel::InstalledService& service =
+        model_->GetInstalledServiceAt(i);
+    if (service.url != url)
+      continue;
+
+    ThrobberNativeTextButton* button =
+        static_cast<ThrobberNativeTextButton*>(child_at(i));
+    button->StartThrobber();
+    return;
+  }
+}
+
 void ServiceButtonsView::ButtonPressed(views::Button* sender,
                                        const views::Event& event) {
   size_t index = static_cast<size_t>(sender->tag());
   delegate_->OnServiceButtonClicked(model_->GetInstalledServiceAt(index));
 }
 
 gfx::Size ServiceButtonsView::GetPreferredSize() {
   // If there are no service buttons, hide this view.
   if (model_->GetInstalledServiceCount() == 0)
     return gfx::Size();
@@ skipping 123 matching lines @@
   // A delegate to respond to button presses and clicked links.
   Delegate* delegate_;
 
   // The icon of the extension.
   views::ImageView* icon_;
 
   // The title of the extension, which links to the CWS detailed description of
   // this extension.
   views::Link* title_link_;
 
-  // A throbber to display when the extension is being installed.
-  views::Throbber* throbber_;
-
   // The star rating of this extension.
   StarsView* stars_;
 
   // A button to install the extension.
-  views::NativeTextButton* install_button_;
+  ThrobberNativeTextButton* install_button_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestedExtensionsRowView);
 };
 
 SuggestedExtensionsRowView::SuggestedExtensionsRowView(
     const WebIntentPickerModel::SuggestedExtension* extension,
     Delegate* delegate)
     : extension_(extension),
       delegate_(delegate) {
   SetLayoutManager(new SuggestedExtensionsLayout);
 
   icon_ = new views::ImageView();
   icon_->SetImage(extension_->icon.ToSkBitmap());
   AddChildView(icon_);
 
   string16 elided_title = ui::ElideText(
       extension_->title, gfx::Font(), kTitleLinkMaxWidth, ui::ELIDE_AT_END);
   title_link_ = new views::Link(elided_title);
   title_link_->set_listener(this);
   AddChildView(title_link_);
 
-  throbber_ = new views::Throbber(60, true);
-  throbber_->SetVisible(false);
-  AddChildView(throbber_);
-
   stars_ = new StarsView(extension_->average_rating);
   AddChildView(stars_);
 
-  install_button_= new views::NativeTextButton(
+  install_button_= new ThrobberNativeTextButton(
       this, l10n_util::GetStringUTF16(IDS_INTENT_PICKER_INSTALL_EXTENSION));
   AddChildView(install_button_);
 }
 
 SuggestedExtensionsRowView::~SuggestedExtensionsRowView() {
 }
 
 void SuggestedExtensionsRowView::ButtonPressed(views::Button* sender,
                                                const views::Event& event) {
   delegate_->OnExtensionInstallClicked(extension_->id);
 }
 
 void SuggestedExtensionsRowView::LinkClicked(views::Link* source,
                                              int event_flags) {
   delegate_->OnExtensionLinkClicked(extension_->id);
 }
 
 void SuggestedExtensionsRowView::StartThrobber() {
-  stars_->SetVisible(false);
-  install_button_->SetVisible(false);
-  throbber_->SetVisible(true);
-  throbber_->Start();
-  Layout();
+  install_button_->StartThrobber();
+  install_button_->SetText(string16());
 }
 
 void SuggestedExtensionsRowView::StopThrobber() {
-  stars_->SetVisible(true);
-  install_button_->SetVisible(true);
-  throbber_->SetVisible(false);
-  throbber_->Stop();
-  Layout();
+  install_button_->StopThrobber();
+  install_button_->SetText(
+      l10n_util::GetStringUTF16(IDS_INTENT_PICKER_INSTALL_EXTENSION));
 }
 
 void SuggestedExtensionsRowView::OnEnabledChanged() {
   title_link_->SetEnabled(enabled());
-  stars_->SetVisible(enabled());
-  install_button_->SetVisible(enabled());
+  stars_->SetEnabled(enabled());
+  install_button_->SetEnabled(enabled());
   View::OnEnabledChanged();
   Layout();
 }
 
 void SuggestedExtensionsRowView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   if (!enabled())
     canvas->FillRect(GetLocalBounds(), kHalfOpacityWhite);
 }
 
 // SuggestedExtensionsView -----------------------------------------------------
 
 // A view that contains suggested extensions from the Chrome Web Store that
 // provide an intent service matching the action/type pair.
-// This view also displays the "More suggestions" link which searches the
-// Chrome Web Store for more extensions.
 class SuggestedExtensionsView : public views::View {
  public:
   SuggestedExtensionsView(const WebIntentPickerModel* model,
                           SuggestedExtensionsRowView::Delegate* delegate);
 
   virtual ~SuggestedExtensionsView();
 
   void Clear();
 
   // Update the view to the new model data.
   void Update();
 
   // Show the install throbber for the row containing |extension_id|. This
   // function also hides hides and disables other buttons and links.
   void StartThrobber(const string16& extension_id);
 
   // Hide the install throbber. This function re-enables all buttons and links.
   void StopThrobber();
 
+ protected:
+  virtual void OnEnabledChanged() OVERRIDE;
+
  private:
   const WebIntentPickerModel* model_;
   SuggestedExtensionsRowView::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestedExtensionsView);
 };
 
 SuggestedExtensionsView::SuggestedExtensionsView(
     const WebIntentPickerModel* model,
     SuggestedExtensionsRowView::Delegate* delegate)
@@ skipping 38 matching lines @@
 
 void SuggestedExtensionsView::StopThrobber() {
   for (size_t i = 0; i < model_->GetSuggestedExtensionCount(); ++i) {
     SuggestedExtensionsRowView* row =
         static_cast<SuggestedExtensionsRowView*>(child_at(i));
     row->SetEnabled(true);
     row->StopThrobber();
   }
 }
 
+void SuggestedExtensionsView::OnEnabledChanged() {
+  EnableChildViews(this, enabled());
+  View::OnEnabledChanged();
+}
+
 }  // namespace
 
 // WebIntentPickerViews --------------------------------------------------------
 
 // Views implementation of WebIntentPicker.
 class WebIntentPickerViews : public views::ButtonListener,
                              public views::DialogDelegate,
                              public views::LinkListener,
                              public WebIntentPicker,
                              public WebIntentPickerModelObserver,
@@ skipping 19 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 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,
                                    const GURL& url) OVERRIDE;
 
@@ skipping 48 matching lines @@
 
   // A weak pointer to the constrained window.
   ConstrainedWindowViews* window_;
 
   // A weak pointer to the more suggestions link.
   views::Link* more_suggestions_link_;
 
   // A weak pointer to the choose another service link.
   views::Link* choose_another_service_link_;
 
+  // Set to true when displaying the inline disposition web contents. Used to
+  // prevent laying out the inline disposition widgets twice.
+  bool displaying_web_contents_;
+
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerViews);
 };
 
 // static
 WebIntentPicker* WebIntentPicker::Create(Browser* browser,
                                          TabContentsWrapper* wrapper,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
   WebIntentPickerViews* picker =
       new WebIntentPickerViews(browser, wrapper, delegate, model);
 
   return picker;
 }
 
 WebIntentPickerViews::WebIntentPickerViews(Browser* browser,
                                            TabContentsWrapper* wrapper,
                                            WebIntentPickerDelegate* delegate,
                                            WebIntentPickerModel* model)
     : delegate_(delegate),
       model_(model),
       service_buttons_(NULL),
       action_label_(NULL),
       suggestions_label_(NULL),
       extensions_(NULL),
       browser_(browser),
       contents_(NULL),
       window_(NULL),
       more_suggestions_link_(NULL),
-      choose_another_service_link_(NULL) {
+      choose_another_service_link_(NULL),
+      displaying_web_contents_(false) {
   model_->set_observer(this);
   InitContents();
 
   // Show the dialog.
   window_ = new ConstrainedWindowViews(wrapper, this);
 }
 
 WebIntentPickerViews::~WebIntentPickerViews() {
   model_->set_observer(NULL);
 }
@@ skipping 59 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::OnModelChanged(WebIntentPickerModel* model) {
-  if (model->GetInstalledServiceCount() == 0) {
-    suggestions_label_->SetText(l10n_util::GetStringUTF16(
-        IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED));
-  } else {
-    suggestions_label_->SetText(
-        l10n_util::GetStringUTF16(IDS_INTENT_PICKER_GET_MORE_SERVICES));
-  }
-
-  service_buttons_->Update();
-  extensions_->Update();
-  contents_->Layout();
-  SizeToContents();
-}
-
-void WebIntentPickerViews::OnFaviconChanged(
-    WebIntentPickerModel* model, size_t index) {
-  service_buttons_->Update();
-  contents_->Layout();
-  SizeToContents();
-}
-
-void WebIntentPickerViews::OnExtensionIconChanged(
-    WebIntentPickerModel* model,
-    const string16& extension_id) {
-  extensions_->Update();
-  contents_->Layout();
-  SizeToContents();
-}
-
-void WebIntentPickerViews::OnInlineDisposition(
-    WebIntentPickerModel* model, const GURL& url) {
-  WebContents* web_contents = WebContents::Create(
-      browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
-  inline_disposition_delegate_.reset(new WebIntentInlineDispositionDelegate);
-  web_contents->SetDelegate(inline_disposition_delegate_.get());
-
-  const WebIntentPickerModel::InstalledService* service =
-      model->GetInstalledServiceWithURL(url);
-  DCHECK(service);
-
-  // Must call this immediately after WebContents creation to avoid race
-  // with load.
-  delegate_->OnInlineDispositionWebContentsCreated(web_contents);
-
-  TabContentsContainer* tab_contents_container = new TabContentsContainer;
-
-  web_contents->GetController().LoadURL(
-      url,
-      content::Referrer(),
-      content::PAGE_TRANSITION_START_PAGE,
-      std::string());
+void WebIntentPickerViews::OnInlineDispositionWebContentsLoaded(
+    content::WebContents* web_contents) {
+  if (displaying_web_contents_)
+    return;
 
   // Replace the picker with the inline disposition.
   contents_->RemoveAllChildViews(true);
 
   views::GridLayout* grid_layout = new views::GridLayout(contents_);
   contents_->SetLayoutManager(grid_layout);
 
   grid_layout->SetInsets(kContentAreaBorder, kContentAreaBorder,
                          kContentAreaBorder, kContentAreaBorder);
   views::ColumnSet* header_cs = grid_layout->AddColumnSet(0);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Icon.
   header_cs->AddPaddingColumn(0, 4);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Title.
   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,
                      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_);
 
 #if defined(USE_CLOSE_BUTTON)
   grid_layout->AddView(CreateCloseButton());
 #endif
 
   // Inline web contents row.
   grid_layout->StartRow(0, 1);
+  TabContentsContainer* tab_contents_container = new TabContentsContainer;
   grid_layout->AddView(tab_contents_container, 1, 1, GridLayout::CENTER,
                        GridLayout::CENTER, kDialogMinWidth, 140);
 
   // The contents can only be changed after the child is added to view
   // hierarchy.
   tab_contents_container->ChangeWebContents(web_contents);
-
   contents_->Layout();
   SizeToContents();
+  displaying_web_contents_ = true;
+}
+
+void WebIntentPickerViews::OnModelChanged(WebIntentPickerModel* model) {
+  if (model->GetInstalledServiceCount() == 0) {
+    suggestions_label_->SetText(l10n_util::GetStringUTF16(
+        IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED));
+  } else {
+    suggestions_label_->SetText(
+        l10n_util::GetStringUTF16(IDS_INTENT_PICKER_GET_MORE_SERVICES));
+  }
+
+  service_buttons_->Update();
+  extensions_->Update();
+  contents_->Layout();
+  SizeToContents();
+}
+
+void WebIntentPickerViews::OnFaviconChanged(
+    WebIntentPickerModel* model, size_t index) {
+  service_buttons_->Update();
+  contents_->Layout();
+  SizeToContents();
+}
+
+void WebIntentPickerViews::OnExtensionIconChanged(
+    WebIntentPickerModel* model,
+    const string16& extension_id) {
+  extensions_->Update();
+  contents_->Layout();
+  SizeToContents();
+}
+
+void WebIntentPickerViews::OnInlineDisposition(
+    WebIntentPickerModel* model, const GURL& url) {
+  WebContents* web_contents = WebContents::Create(
+      browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
+  inline_disposition_delegate_.reset(
+      new WebIntentInlineDispositionDelegate(this));
+  web_contents->SetDelegate(inline_disposition_delegate_.get());
+
+  const WebIntentPickerModel::InstalledService* service =
+      model->GetInstalledServiceWithURL(url);
+  DCHECK(service);
+
+  // Must call this immediately after WebContents creation to avoid race
+  // with load.
+  delegate_->OnInlineDispositionWebContentsCreated(web_contents);
+  web_contents->GetController().LoadURL(
+      url,
+      content::Referrer(),
+      content::PAGE_TRANSITION_START_PAGE,
+      std::string());
+
+  // Disable all buttons and show throbber.
+  service_buttons_->SetEnabled(false);
+  service_buttons_->StartThrobber(url);
+  extensions_->SetEnabled(false);
+  more_suggestions_link_->SetEnabled(false);
+  contents_->Layout();
 }
 
 void WebIntentPickerViews::OnServiceButtonClicked(
     const WebIntentPickerModel::InstalledService& service) {
   delegate_->OnServiceChosen(service.url, service.disposition);
 }
 
 void WebIntentPickerViews::OnExtensionInstallClicked(
     const string16& extension_id) {
   service_buttons_->SetEnabled(false);
@@ skipping 110 matching lines @@
   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