TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/website_settings_popup_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/website_settings_popup_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/cert_store.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 34 matching lines @@
       NOTREACHED();
       return "";
   }
 }
 
 }  // namespace
 
 // static
 void WebsiteSettingsPopupGtk::Show(gfx::NativeWindow parent,
                                    Profile* profile,
-                                   TabContentsWrapper* tab_contents_wrapper,
+                                   TabContents* tab_contents,
                                    const GURL& url,
                                    const content::SSLStatus& ssl) {
-  new WebsiteSettingsPopupGtk(parent, profile, tab_contents_wrapper, url, ssl);
+  new WebsiteSettingsPopupGtk(parent, profile, tab_contents, url, ssl);
 }
 
 WebsiteSettingsPopupGtk::WebsiteSettingsPopupGtk(
     gfx::NativeWindow parent,
     Profile* profile,
-    TabContentsWrapper* tab_contents_wrapper,
+    TabContents* tab_contents,
     const GURL& url,
     const content::SSLStatus& ssl)
     : parent_(parent),
       contents_(NULL),
       theme_service_(GtkThemeService::GetFrom(profile)),
       profile_(profile),
-      tab_contents_wrapper_(tab_contents_wrapper),
+      tab_contents_(tab_contents),
       browser_(NULL),
       cert_id_(0),
       header_box_(NULL),
       cookies_section_contents_(NULL),
       permissions_section_contents_(NULL),
       identity_tab_contents_(NULL),
       first_visit_contents_(NULL),
       presenter_(NULL) {
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent);
@@ skipping 14 matching lines @@
                                 BubbleGtk::POPUP_WINDOW |
                                 BubbleGtk::GRAB_INPUT,
                             theme_service_,
                             this);  // |delegate|
   if (!bubble_) {
     NOTREACHED();
     return;
   }
 
   presenter_.reset(new WebsiteSettings(this, profile,
-                                       tab_contents_wrapper->content_settings(),
+                                       tab_contents->content_settings(),
                                        url, ssl,
                                        content::CertStore::GetInstance()));
 }
 
 WebsiteSettingsPopupGtk::~WebsiteSettingsPopupGtk() {
 }
 
 void WebsiteSettingsPopupGtk::BubbleClosing(BubbleGtk* bubble,
                                             bool closed_by_escape) {
   if (presenter_.get())
@@ skipping 355 matching lines @@
   // (otherwise, GTK won't activate our widgets when the user clicks in them).
   gboolean popup_shown = FALSE;
   g_object_get(G_OBJECT(GTK_COMBO_BOX(widget)), "popup-shown", &popup_shown,
                NULL);
   if (!popup_shown)
     bubble_->HandlePointerAndKeyboardUngrabbedByContent();
 }
 
 void WebsiteSettingsPopupGtk::OnCookiesLinkClicked(GtkWidget* widget) {
   new CollectedCookiesGtk(GTK_WINDOW(parent_),
-                          tab_contents_wrapper_);
+                          tab_contents_);
   bubble_->Close();
 }
 
 void WebsiteSettingsPopupGtk::OnPermissionsSettingsLinkClicked(
     GtkWidget* widget) {
   browser_->OpenURL(OpenURLParams(
       GURL(std::string(
            chrome::kChromeUISettingsURL) + chrome::kContentSettingsSubPage),
       content::Referrer(),
       NEW_FOREGROUND_TAB,
@@ skipping 16 matching lines @@
   if (presenter_.get())
     presenter_->OnSitePermissionChanged(ContentSettingsType(type),
                                         ContentSetting(value));
 }
 
 void WebsiteSettingsPopupGtk::OnViewCertLinkClicked(GtkWidget* widget) {
   DCHECK_NE(cert_id_, 0);
   ShowCertificateViewerByID(GTK_WINDOW(parent_), cert_id_);
   bubble_->Close();
 }