Remove unneeded TabContents::FromWebContents.

chrome/browser/ui/gtk/web_intent_picker_gtk.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/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/event_utils.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/gtk/throbber_gtk.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.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/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.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 "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 18 matching lines @@
 const int kMainContentPixelSize = 13;
 
 // Indices of the extension row widgets.
 enum {
   kIconIndex,
   kTitleLinkIndex,
   kStarsIndex,
   kInstallButtonIndex,
 };
 
-GtkThemeService *GetThemeService(TabContents* tab_contents) {
-  return GtkThemeService::GetFrom(tab_contents->profile());
+GtkThemeService *GetThemeService(WebContents* web_contents) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  return GtkThemeService::GetFrom(profile);
 }
 
 // Set the image of |button| to |pixbuf|.
 void SetServiceButtonImage(GtkWidget* button, GdkPixbuf* pixbuf) {
   gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_pixbuf(pixbuf));
   gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_LEFT);
 }
 
 void SetWidgetFontSizeCallback(GtkWidget* widget, gpointer data) {
   if (GTK_IS_LABEL(widget)) {
@@ skipping 109 matching lines @@
                             kMainContentPixelSize, kDialogSpacing, 0, 0);
   gtk_container_add(GTK_CONTAINER(label_alignment), message_label);
   gtk_box_pack_start(GTK_BOX(vbox), label_alignment, TRUE, TRUE, 0);
 
   // TODO(groby): use IDR_SPEECH_INPUT_SPINNER. Pending fix for ThrobberGtk.
   // Animate throbber
   throbber->Start();
 }
 
 // static
-WebIntentPicker* WebIntentPicker::Create(content::WebContents* web_contents,
+WebIntentPicker* WebIntentPicker::Create(WebContents* web_contents,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents);
-  return new WebIntentPickerGtk(tab_contents, delegate, model);
+  return new WebIntentPickerGtk(web_contents, delegate, model);
 }
 
-WebIntentPickerGtk::WebIntentPickerGtk(TabContents* tab_contents,
+WebIntentPickerGtk::WebIntentPickerGtk(WebContents* web_contents,
                                        WebIntentPickerDelegate* delegate,
                                        WebIntentPickerModel* model)
-    : tab_contents_(tab_contents),
+    : web_contents_(web_contents),
       delegate_(delegate),
       model_(model),
       contents_(NULL),
       header_label_(NULL),
       button_vbox_(NULL),
       cws_label_(NULL),
       extensions_vbox_(NULL),
       service_hbox_(NULL),
       window_(NULL) {
   DCHECK(delegate_ != NULL);
 
   model_->set_observer(this);
   InitContents();
   UpdateInstalledServices();
   UpdateCWSLabel();
   UpdateSuggestedExtensions();
 
-  GtkThemeService* theme_service = GetThemeService(tab_contents);
+  GtkThemeService* theme_service = GetThemeService(web_contents);
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                        content::Source<ThemeService>(theme_service));
   theme_service->InitThemesFor(this);
 
-  window_ = new ConstrainedWindowGtk(tab_contents->web_contents(), this);
+  window_ = new ConstrainedWindowGtk(web_contents, this);
 
   if (model_->IsInlineDisposition())
     OnInlineDisposition(string16(), model_->inline_disposition_url());
 }
 
 WebIntentPickerGtk::~WebIntentPickerGtk() {
 }
 
 void WebIntentPickerGtk::Close() {
   window_->CloseConstrainedWindow();
@@ skipping 44 matching lines @@
 
 void WebIntentPickerGtk::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const std::string& extension_id) {
   UpdateSuggestedExtensions();
 }
 
 void WebIntentPickerGtk::OnInlineDisposition(const string16&,
                                              const GURL& url) {
   DCHECK(delegate_);
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   inline_disposition_web_contents_.reset(
-      delegate_->CreateWebContentsForInlineDisposition(
-          tab_contents_->profile(), url));
-  Browser* browser = chrome::FindBrowserWithWebContents(
-      tab_contents_->web_contents());
+      delegate_->CreateWebContentsForInlineDisposition(profile, url));
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(
           this, inline_disposition_web_contents_.get(), browser));
 
   inline_disposition_web_contents_->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 
   // Replace the picker contents with the inline disposition.
   ClearContents();
   gtk_widget_set_size_request(contents_, -1, -1);
   window_->BackgroundColorChanged();
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
-  GtkThemeService* theme_service = GetThemeService(tab_contents_);
+  GtkThemeService* theme_service = GetThemeService(web_contents_);
 
   service_hbox_ = gtk_hbox_new(FALSE, ui::kControlSpacing);
   // TODO(gbillock): Eventually get the service icon button here.
 
   // Intent action label.
   const WebIntentPickerModel::InstalledService* service =
       model_->GetInstalledServiceWithURL(url);
   GtkWidget* action_label = gtk_label_new(UTF16ToUTF8(service->title).c_str());
   gtk_util::ForceFontSizePixels(action_label, kMainContentPixelSize);
   // Hardcode color; don't allow theming.
@@ skipping 45 matching lines @@
 
   gfx::Size size = GetMinInlineDispositionSize();
   gtk_widget_set_size_request(web_contents_widget,
                               size.width(), size.height());
   gtk_widget_show_all(contents_);
 
   inline_disposition_delegate_->SetRenderViewSizeLimits();
   inline_disposition_web_contents_->GetView()->SetInitialFocus();
   host_signals_.reset(new ui::GtkSignalRegistrar());
   host_signals_->Connect(
-      tab_contents_->web_contents()->GetRenderViewHost()->GetView()->
-          GetNativeView(),
+      web_contents_->GetRenderViewHost()->GetView()->GetNativeView(),
       "size-allocate",
       G_CALLBACK(OnHostContentsSizeAllocateThunk), this);
 }
 
 void WebIntentPickerGtk::OnInlineDispositionAutoResize(const gfx::Size& size) {
   gfx::NativeView web_contents_widget =
       inline_disposition_web_contents_->GetView()->GetNativeView();
   gtk_widget_set_size_request(web_contents_widget, size.width(), size.height());
 }
 
 gfx::Size WebIntentPickerGtk::GetMaxInlineDispositionSize() {
-  gfx::Rect tab_bounds(tab_contents_->web_contents()->GetRenderViewHost()->
+  gfx::Rect tab_bounds(web_contents_->GetRenderViewHost()->
       GetView()->GetNativeView()->allocation);
   GtkRequisition req = {};
   if (service_hbox_)
     gtk_widget_size_request(service_hbox_, &req);
 
   tab_bounds.Inset(2 * ui::kContentAreaBorder,
                    2 * ui::kContentAreaBorder + req.height);
   return tab_bounds.size();
 }
 
@@ skipping 17 matching lines @@
 
   // Replace the dialog header.
   DCHECK(header_label_);
   gtk_label_set_text(
       GTK_LABEL(header_label_),
       l10n_util::GetStringUTF8(IDS_INTENT_PICKER_NO_SERVICES_TITLE).c_str());
 
   // Add the message text.
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(sub_contents), hbox, TRUE, TRUE, 0);
-  GtkThemeService* theme_service = GetThemeService(tab_contents_);
+  GtkThemeService* theme_service = GetThemeService(web_contents_);
   GtkWidget* no_service_label = theme_service->BuildLabel(
       l10n_util::GetStringUTF8(IDS_INTENT_PICKER_NO_SERVICES).c_str(),
       ui::kGdkBlack);
   gtk_label_set_line_wrap(GTK_LABEL(no_service_label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(no_service_label), 0, 0);
   // Set the label width to the size of |sub_contents|, which we don't have
   // access to yet, by calculating the main content width minus borders.
   gtk_util::SetLabelWidth(no_service_label,
                           kWindowMinWidth - 2 * ui::kContentAreaBorder);
   gtk_box_pack_start(GTK_BOX(hbox), no_service_label, TRUE, TRUE, 0);
@@ skipping 31 matching lines @@
 
 bool WebIntentPickerGtk::ShouldHaveBorderPadding() const {
   return false;
 }
 
 void WebIntentPickerGtk::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
   if (header_label_) {
-    GtkThemeService* theme_service = GetThemeService(tab_contents_);
+    GtkThemeService* theme_service = GetThemeService(web_contents_);
     if (theme_service->UsingNativeTheme())
       gtk_util::UndoForceFontSize(header_label_);
     else
       gtk_util::ForceFontSizePixels(header_label_, kHeaderLabelPixelSize);
   }
   UpdateInstalledServices();
   UpdateSuggestedExtensions();
 }
 
 void WebIntentPickerGtk::OnDestroy(GtkWidget* button) {
@@ skipping 77 matching lines @@
 
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
 
   delegate_->OnServiceChosen(installed_service.url,
                              installed_service.disposition,
                              WebIntentPickerDelegate::kEnableDefaults);
 }
 
 void WebIntentPickerGtk::InitContents() {
-  GtkThemeService* theme_service = GetThemeService(tab_contents_);
+  GtkThemeService* theme_service = GetThemeService(web_contents_);
 
   // Main contents vbox.
   if (!contents_) {
     contents_ = gtk_vbox_new(FALSE, 0);
     g_signal_connect(contents_, "destroy", G_CALLBACK(&OnDestroyThunk), this);
   }
 
   gtk_widget_set_size_request(contents_, kWindowMinWidth, -1);
 
   if (model_ && model_->IsWaitingForSuggestions()) {
     ClearContents();
     AddCloseButton(contents_);
     waiting_dialog_.reset(new WaitingDialog(theme_service));
     gtk_box_pack_start(GTK_BOX(contents_), waiting_dialog_->widget(),
                        TRUE, TRUE, 0);
   } else {
     InitMainContents();
   }
 }
 
 void WebIntentPickerGtk::InitMainContents() {
-  GtkThemeService* theme_service = GetThemeService(tab_contents_);
+  GtkThemeService* theme_service = GetThemeService(web_contents_);
 
   ClearContents();
 
   AddCloseButton(contents_);
   GtkWidget* sub_contents = CreateSubContents(contents_);
 
   AddTitle(sub_contents);
 
   // Add separation between the installed services list and the app suggestions.
   GtkWidget* button_alignment = gtk_alignment_new(0.5, 0, 0, 0);
@@ skipping 98 matching lines @@
   return sub_contents;
 }
 
 void WebIntentPickerGtk::AddCloseButton(GtkWidget* containingBox) {
 
   // Hbox containing the close button.
   GtkWidget* close_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(containingBox), close_hbox, TRUE, TRUE, 0);
 
   close_button_.reset(
-      CustomDrawButton::CloseButton(GetThemeService(tab_contents_)));
+      CustomDrawButton::CloseButton(GetThemeService(web_contents_)));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonClickThunk), this);
   gtk_widget_set_can_focus(close_button_->widget(), FALSE);
   gtk_box_pack_end(GTK_BOX(close_hbox), close_button_->widget(),
                    FALSE, FALSE, 0);
 }
 
 void WebIntentPickerGtk::AddTitle(GtkWidget* containingBox) {
   // Hbox containing the header label.
   GtkWidget* header_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(containingBox), header_hbox, TRUE, TRUE, 0);
 
   // Label text will be set in the call to SetActionString().
-  header_label_ = GetThemeService(tab_contents_)->BuildLabel(
+  header_label_ = GetThemeService(web_contents_)->BuildLabel(
       std::string(), ui::kGdkBlack);
   gtk_util::ForceFontSizePixels(header_label_, kHeaderLabelPixelSize);
   gtk_box_pack_start(GTK_BOX(header_hbox), header_label_, TRUE, TRUE, 0);
   gtk_misc_set_alignment(GTK_MISC(header_label_), 0, 0);
 }
 
 void WebIntentPickerGtk::UpdateInstalledServices() {
   if (!button_vbox_)
     return;
 
@@ skipping 38 matching lines @@
 
   std::string label_text = UTF16ToUTF8(model_->GetSuggestionsLinkText());
   gtk_label_set_text(GTK_LABEL(cws_label_), label_text.c_str());
   gtk_widget_set_visible(cws_label_, !label_text.empty());
 }
 
 void WebIntentPickerGtk::UpdateSuggestedExtensions() {
   if (!extensions_vbox_)
     return;
 
-  GtkThemeService* theme_service = GetThemeService(tab_contents_);
+  GtkThemeService* theme_service = GetThemeService(web_contents_);
 
   gtk_util::RemoveAllChildren(extensions_vbox_);
 
   if (model_->GetSuggestedExtensionCount() == 0) {
     gtk_widget_hide(gtk_widget_get_parent(extensions_vbox_));
     return;
   }
 
   gtk_widget_show(gtk_widget_get_parent(extensions_vbox_));
 
@@ skipping 65 matching lines @@
   return alignment;
 }
 
 void WebIntentPickerGtk::RemoveThrobber() {
   GtkWidget* alignment = gtk_widget_get_parent(throbber_->widget());
   DCHECK(alignment);
   gtk_container_remove(GTK_CONTAINER(alignment), throbber_->widget());
   gtk_widget_destroy(alignment);
   throbber_->Stop();
 }