| Index: chrome/browser/extensions/extension_browser_event_router.h
|
| diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
|
| index 484798be01d5c41428e8c225f0d27db99444c769..219bb9c7840339af48f9b77edad6b773003405bb 100644
|
| --- a/chrome/browser/extensions/extension_browser_event_router.h
|
| +++ b/chrome/browser/extensions/extension_browser_event_router.h
|
| @@ -63,28 +63,28 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
|
| void OnBrowserWindowReady(Browser* browser);
|
|
|
| // TabStripModelObserver
|
| - virtual void TabInsertedAt(TabContentsWrapper* contents, int index,
|
| + virtual void TabInsertedAt(TabContents* contents, int index,
|
| bool active) OVERRIDE;
|
| virtual void TabClosingAt(TabStripModel* tab_strip_model,
|
| - TabContentsWrapper* contents,
|
| + TabContents* contents,
|
| int index) OVERRIDE;
|
| - 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;
|
| virtual void TabSelectionChanged(
|
| TabStripModel* tab_strip_model,
|
| const TabStripSelectionModel& old_model) OVERRIDE;
|
| - virtual void TabMoved(TabContentsWrapper* contents, int from_index,
|
| + virtual void TabMoved(TabContents* contents, int from_index,
|
| int to_index) 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 TabPinnedStateChanged(TabContentsWrapper* contents,
|
| + virtual void TabPinnedStateChanged(TabContents* contents,
|
| int index) OVERRIDE;
|
| virtual void TabStripEmpty() OVERRIDE;
|
|
|
| @@ -216,7 +216,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
|
| // event to send based on what the extension wants.
|
| void ExtensionActionExecuted(Profile* profile,
|
| const std::string& extension_id,
|
| - TabContentsWrapper* tab_contents);
|
| + TabContents* tab_contents);
|
|
|
| std::map<int, TabEntry> tab_entries_;
|
|
|
|
|