| Index: chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
|
| index c8ae75b6de12127f3727c7773f2fa693ed413981..c086ed601f70f14cf3693e71a101ceca348bd659 100644
|
| --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
|
| +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h
|
| @@ -29,7 +29,6 @@ class CustomDrawButton;
|
| class DraggedTabControllerGtk;
|
| class GtkThemeService;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
|
|
| namespace gfx {
|
| class Image;
|
| @@ -111,29 +110,29 @@ class TabStripGtk : public TabStripModelObserver,
|
|
|
| protected:
|
| // TabStripModelObserver implementation:
|
| - virtual void TabInsertedAt(TabContentsWrapper* contents,
|
| + virtual void TabInsertedAt(TabContents* contents,
|
| int index,
|
| bool foreground) OVERRIDE;
|
| - virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE;
|
| - virtual void TabMoved(TabContentsWrapper* contents,
|
| + virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE;
|
| + virtual void TabMoved(TabContents* contents,
|
| int from_index,
|
| int to_index) OVERRIDE;
|
| - virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
|
| - TabContentsWrapper* new_contents,
|
| + virtual void ActiveTabChanged(TabContents* old_contents,
|
| + TabContents* new_contents,
|
| int index,
|
| bool user_gesture) OVERRIDE;
|
| virtual void TabSelectionChanged(
|
| TabStripModel* tab_strip_model,
|
| const TabStripSelectionModel& old_model) OVERRIDE;
|
| - virtual void TabChangedAt(TabContentsWrapper* contents, int index,
|
| + virtual void TabChangedAt(TabContents* contents, int index,
|
| TabChangeType change_type) OVERRIDE;
|
| virtual void TabReplacedAt(TabStripModel* tab_strip_model,
|
| - TabContentsWrapper* old_contents,
|
| - TabContentsWrapper* new_contents,
|
| + TabContents* old_contents,
|
| + TabContents* new_contents,
|
| int index) OVERRIDE;
|
| - virtual void TabMiniStateChanged(TabContentsWrapper* contents,
|
| + virtual void TabMiniStateChanged(TabContents* contents,
|
| int index) OVERRIDE;
|
| - virtual void TabBlockedStateChanged(TabContentsWrapper* contents,
|
| + virtual void TabBlockedStateChanged(TabContents* contents,
|
| int index) OVERRIDE;
|
|
|
| // TabGtk::TabDelegate implementation:
|
|
|