| Index: chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| index 3b5945b01c78606ae81b88c197c1a4ff1bcc38dc..e9b5fd687bfa65c91d62292c6167340a049f485b 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| @@ -78,7 +78,7 @@ class BrowserWindowCocoa : 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;
|
| @@ -115,7 +115,7 @@ class BrowserWindowCocoa : 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;
|
| @@ -126,7 +126,7 @@ class BrowserWindowCocoa : 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;
|
| @@ -139,7 +139,7 @@ class BrowserWindowCocoa : public BrowserWindow,
|
| FullscreenExitBubbleType bubble_type) OVERRIDE;
|
| virtual void ExitPresentationMode() OVERRIDE;
|
| virtual bool InPresentationMode() 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(
|
|
|