TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/web_intent_picker_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_WEB_INTENT_PICKER_GTK_H_
 #define CHROME_BROWSER_UI_GTK_WEB_INTENT_PICKER_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.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_model_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 class CustomDrawButton;
 class GURL;
 class TabContentsContainerGtk;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class ThrobberGtk;
 class WebIntentPickerDelegate;
 
 // GTK implementation of WebIntentPicker.
 class WebIntentPickerGtk : public WebIntentPicker,
                            public WebIntentPickerModelObserver,
                            public ConstrainedWindowGtkDelegate,
                            public content::NotificationObserver {
  public:
-  WebIntentPickerGtk(TabContentsWrapper* tab_contents,
+  WebIntentPickerGtk(TabContents* tab_contents,
                      WebIntentPickerDelegate* delegate,
                      WebIntentPickerModel* model);
   virtual ~WebIntentPickerGtk();
 
   // 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;
 
@@ skipping 60 matching lines @@
   void SetWidgetsEnabled(bool enabled);
 
   // Adds a throbber to the extension at |index|. Returns the alignment widget
   // containing the throbber.
   GtkWidget* AddThrobberToExtensionAt(size_t index);
 
   // Removes the added throbber.
   void RemoveThrobber();
 
   // A weak pointer to the tab contents on which to display the picker UI.
-  TabContentsWrapper* wrapper_;
+  TabContents* tab_contents_;
 
   // A weak pointer to the WebIntentPickerDelegate to notify when the user
   // chooses a service or cancels.
   WebIntentPickerDelegate* delegate_;
 
   // A weak pointer to the picker model.
   WebIntentPickerModel* model_;
 
   // A weak pointer to the widget that contains all other widgets in
   // the picker.
@@ skipping 15 matching lines @@
   // A button to close the picker.
   scoped_ptr<CustomDrawButton> close_button_;
 
   // The throbber to display when installing an extension.
   scoped_ptr<ThrobberGtk> throbber_;
 
   // A weak pointer to the constrained window.
   ConstrainedWindowGtk* window_;
 
   // Container for the HTML in the inline disposition case.
-  scoped_ptr<TabContentsWrapper> inline_disposition_tab_contents_;
+  scoped_ptr<TabContents> inline_disposition_tab_contents_;
 
   // Widget for displaying the HTML in the inline disposition case.
   scoped_ptr<TabContentsContainerGtk> tab_contents_container_;
 
   // content::WebContentsDelegate for the inline disposition dialog.
   scoped_ptr<WebIntentInlineDispositionDelegate> inline_disposition_delegate_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_WEB_INTENT_PICKER_GTK_H_