| Index: chrome/browser/ui/gtk/browser_window_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
|
| index 7ee1a649e7a82ffe26a798471ccc72a079793a3a..51f135fbeeaee97164977c149e1afb6c0b0b85cd 100644
|
| --- a/chrome/browser/ui/gtk/browser_window_gtk.h
|
| +++ b/chrome/browser/ui/gtk/browser_window_gtk.h
|
| @@ -107,7 +107,7 @@ class BrowserWindowGtk : public BrowserWindow,
|
| virtual LocationBar* GetLocationBar() const OVERRIDE;
|
| virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
|
| virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
|
| - virtual void UpdateToolbar(TabContentsWrapper* contents,
|
| + virtual void UpdateToolbar(TabContents* contents,
|
| bool should_restore_state) OVERRIDE;
|
| virtual void FocusToolbar() OVERRIDE;
|
| virtual void FocusAppMenu() OVERRIDE;
|
| @@ -144,7 +144,7 @@ class BrowserWindowGtk : public BrowserWindow,
|
| const content::SSLStatus& ssl,
|
| bool show_history) OVERRIDE;
|
| virtual void ShowWebsiteSettings(Profile* profile,
|
| - TabContentsWrapper* tab_contents_wrapper,
|
| + TabContents* tab_contents,
|
| const GURL& url,
|
| const content::SSLStatus& ssl,
|
| bool show_history) OVERRIDE;
|
| @@ -155,14 +155,14 @@ class BrowserWindowGtk : public BrowserWindow,
|
| virtual void HandleKeyboardEvent(
|
| const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
| virtual void ShowCreateWebAppShortcutsDialog(
|
| - TabContentsWrapper* tab_contents) OVERRIDE;
|
| + TabContents* tab_contents) OVERRIDE;
|
| virtual void ShowCreateChromeAppShortcutsDialog(
|
| Profile* profile,
|
| const extensions::Extension* app) OVERRIDE;
|
| virtual void Cut() OVERRIDE;
|
| virtual void Copy() OVERRIDE;
|
| virtual void Paste() OVERRIDE;
|
| - virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
|
| + virtual void ShowInstant(TabContents* preview) OVERRIDE;
|
| virtual void HideInstant() OVERRIDE;
|
| virtual gfx::Rect GetInstantBounds() OVERRIDE;
|
| virtual WindowOpenDisposition GetDispositionForPopupBounds(
|
| @@ -182,9 +182,9 @@ class BrowserWindowGtk : public BrowserWindow,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| // Overridden from TabStripModelObserver:
|
| - virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE;
|
| - virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
|
| - TabContentsWrapper* new_contents,
|
| + virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE;
|
| + virtual void ActiveTabChanged(TabContents* old_contents,
|
| + TabContents* new_contents,
|
| int index,
|
| bool user_gesture) OVERRIDE;
|
|
|
| @@ -252,7 +252,7 @@ class BrowserWindowGtk : public BrowserWindow,
|
| gfx::Rect bounds() const { return bounds_; }
|
|
|
| // Returns the tab we're currently displaying in the tab contents container.
|
| - TabContentsWrapper* GetDisplayedTab();
|
| + TabContents* GetDisplayedTab();
|
|
|
| static void RegisterUserPrefs(PrefService* prefs);
|
|
|
|
|