| Index: chrome/browser/ui/gtk/tab_contents_container_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.h b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
|
| index b3e4642ffd036399b4d78767694c9dd5a95fdc13..01ea9b4a860a2badd3a51c6d39321aef9bec530c 100644
|
| --- a/chrome/browser/ui/gtk/tab_contents_container_gtk.h
|
| +++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
|
| @@ -18,7 +18,6 @@
|
|
|
| class StatusBubbleGtk;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
|
|
| namespace content {
|
| class WebContents;
|
| @@ -35,19 +34,19 @@ class TabContentsContainerGtk : public content::NotificationObserver,
|
| void Init();
|
|
|
| // Make the specified tab visible.
|
| - void SetTab(TabContentsWrapper* tab);
|
| - TabContentsWrapper* tab() const { return tab_; }
|
| + void SetTab(TabContents* tab);
|
| + TabContents* tab() const { return tab_; }
|
|
|
| - // Returns the TabContentsWrapper currently displayed.
|
| - TabContentsWrapper* GetVisibleTab();
|
| + // Returns the TabContents currently displayed.
|
| + TabContents* GetVisibleTab();
|
|
|
| bool HasPreview() const { return preview_ != NULL; }
|
|
|
| - void SetPreview(TabContentsWrapper* preview);
|
| + void SetPreview(TabContents* preview);
|
| void PopPreview();
|
|
|
| // Remove the tab from the hierarchy.
|
| - void DetachTab(TabContentsWrapper* tab);
|
| + void DetachTab(TabContents* tab);
|
|
|
| // content::NotificationObserver implementation.
|
| virtual void Observe(int type,
|
| @@ -72,10 +71,10 @@ class TabContentsContainerGtk : public content::NotificationObserver,
|
| TabContentsContainerGtk* tab_contents_container);
|
|
|
| // Adds |tab| to the container and starts showing it.
|
| - void PackTab(TabContentsWrapper* );
|
| + void PackTab(TabContents* tab);
|
|
|
| // Stops showing |tab|.
|
| - void HideTab(TabContentsWrapper* tab);
|
| + void HideTab(TabContents* tab);
|
|
|
| // Removes |preview_|.
|
| void RemovePreview();
|
| @@ -87,13 +86,13 @@ class TabContentsContainerGtk : public content::NotificationObserver,
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|
| - // The TabContentsWrapper for the currently selected tab. This will be showing
|
| + // The TabContents for the currently selected tab. This will be showing
|
| // unless there is a preview contents.
|
| - TabContentsWrapper* tab_;
|
| + TabContents* tab_;
|
|
|
| // The current preview contents (for instant). If non-NULL, it will be
|
| // visible.
|
| - TabContentsWrapper* preview_;
|
| + TabContents* preview_;
|
|
|
| // The status bubble manager. Always non-NULL.
|
| StatusBubbleGtk* status_bubble_;
|
|
|