TabContentsWrapper -> TabContents, part 41.

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_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/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/tab_contents_container_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_wrapper.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 "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
@@ skipping 23 matching lines @@
 const int kTitleLinkMaxWidth = 130;
 
 // Indices of the extension row widgets.
 enum {
   kIconIndex,
   kTitleLinkIndex,
   kStarsIndex,
   kInstallButtonIndex,
 };
 
-GtkThemeService *GetThemeService(TabContentsWrapper* wrapper) {
-  return GtkThemeService::GetFrom(wrapper->profile());
+GtkThemeService *GetThemeService(TabContents* tab_contents) {
+  return GtkThemeService::GetFrom(tab_contents->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 47 matching lines @@
     gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(star),
                        FALSE, FALSE, 0);
   }
 
   return hbox;
 }
 
 } // namespace
 
 // static
-WebIntentPicker* WebIntentPicker::Create(TabContentsWrapper* wrapper,
+WebIntentPicker* WebIntentPicker::Create(TabContents* tab_contents,
                                          WebIntentPickerDelegate* delegate,
                                          WebIntentPickerModel* model) {
-  return new WebIntentPickerGtk(wrapper, delegate, model);
+  return new WebIntentPickerGtk(tab_contents, delegate, model);
 }
 
-WebIntentPickerGtk::WebIntentPickerGtk(TabContentsWrapper* wrapper,
+WebIntentPickerGtk::WebIntentPickerGtk(TabContents* tab_contents,
                                        WebIntentPickerDelegate* delegate,
                                        WebIntentPickerModel* model)
-    : wrapper_(wrapper),
+    : tab_contents_(tab_contents),
       delegate_(delegate),
       model_(model),
       contents_(NULL),
       header_label_(NULL),
       button_vbox_(NULL),
       cws_label_(NULL),
       extensions_vbox_(NULL),
       window_(NULL) {
   DCHECK(delegate_ != NULL);
 
   model_->set_observer(this);
   InitContents();
   UpdateInstalledServices();
   UpdateCWSLabel();
   UpdateSuggestedExtensions();
 
-  GtkThemeService* theme_service = GetThemeService(wrapper);
+  GtkThemeService* theme_service = GetThemeService(tab_contents);
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                        content::Source<ThemeService>(theme_service));
   theme_service->InitThemesFor(this);
 
-  window_ = new ConstrainedWindowGtk(wrapper, this);
+  window_ = new ConstrainedWindowGtk(tab_contents, this);
 }
 
 WebIntentPickerGtk::~WebIntentPickerGtk() {
 }
 
 void WebIntentPickerGtk::Close() {
   window_->CloseConstrainedWindow();
   if (inline_disposition_tab_contents_.get())
     inline_disposition_tab_contents_->web_contents()->OnCloseStarted();
 }
@@ skipping 33 matching lines @@
 }
 
 void WebIntentPickerGtk::OnExtensionIconChanged(WebIntentPickerModel* model,
                                                 const string16& extension_id) {
   UpdateSuggestedExtensions();
 }
 
 void WebIntentPickerGtk::OnInlineDisposition(WebIntentPickerModel* model,
                                              const GURL& url) {
   content::WebContents* web_contents = content::WebContents::Create(
-      wrapper_->profile(),
-      tab_util::GetSiteInstanceForNewTab(wrapper_->profile(), url),
+      tab_contents_->profile(),
+      tab_util::GetSiteInstanceForNewTab(tab_contents_->profile(), url),
       MSG_ROUTING_NONE, NULL, NULL);
-  inline_disposition_tab_contents_.reset(new TabContentsWrapper(web_contents));
+  inline_disposition_tab_contents_.reset(new TabContents(web_contents));
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(this, web_contents,
-                                             wrapper_->profile()));
+                                             tab_contents_->profile()));
 
   // Must call this immediately after WebContents creation to avoid race
   // with load.
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 
   tab_contents_container_.reset(new TabContentsContainerGtk(NULL));
   tab_contents_container_->SetTab(inline_disposition_tab_contents_.get());
 
   inline_disposition_tab_contents_->web_contents()->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_START_PAGE,
@@ skipping 55 matching lines @@
   AddTitle(sub_contents);
 
   // Replace the dialog header.
   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(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(tab_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,
                           kMainContentWidth - 2 * ui::kContentAreaBorder);
   gtk_box_pack_start(GTK_BOX(hbox), no_service_label, TRUE, TRUE, 0);
@@ skipping 16 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);
-  GtkThemeService* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(tab_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 58 matching lines @@
   g_list_free(button_list);
 
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
 
   delegate_->OnServiceChosen(installed_service.url,
                              installed_service.disposition);
 }
 
 void WebIntentPickerGtk::InitContents() {
-  GtkThemeService* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(tab_contents_);
 
   // Main contents vbox.
   contents_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_size_request(contents_, kMainContentWidth, -1);
 
   AddCloseButton(contents_);
   GtkWidget* sub_contents = CreateSubContents(contents_);
   AddTitle(sub_contents);
 
   // Add separation between the installed services list and the app suggestions.
@@ skipping 64 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(wrapper_)));
+      CustomDrawButton::CloseButton(GetThemeService(tab_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(wrapper_)->BuildLabel(
+  header_label_ = GetThemeService(tab_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() {
   gtk_util::RemoveAllChildren(button_vbox_);
 
   if (model_->GetInstalledServiceCount() == 0) {
@@ skipping 37 matching lines @@
     gtk_widget_show(gtk_widget_get_parent(button_vbox_));
   }
 
   if (model_->GetSuggestedExtensionCount() == 0)
     gtk_widget_hide(cws_label_);
   else
     gtk_widget_show(cws_label_);
 }
 
 void WebIntentPickerGtk::UpdateSuggestedExtensions() {
-  GtkThemeService* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(tab_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 63 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();
 }