diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
| commit | 10b833ebf1528dbfd186018c66961956bd2a9e39 (patch) | |
| tree | fcf3bd5c31c45e7472ae8c4445a796990693be49 /chrome/browser/extensions/extension_browser_event_router.cc | |
| parent | 2b833518315d574e12ec8120785116da2d0bf993 (diff) | |
| download | chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.zip chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.gz chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.bz2 | |
Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests
on win,linux,mac.
Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
TBR=jam
Review URL: http://codereview.chromium.org/9018016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browser_event_router.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_browser_event_router.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index a415f5b..2cfa328 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -142,9 +142,8 @@ void ExtensionBrowserEventRouter::RegisterForBrowserNotifications( void ExtensionBrowserEventRouter::RegisterForTabNotifications( TabContents* contents) { - registrar_.Add( - this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&contents->GetController())); + registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, + content::Source<NavigationController>(&contents->controller())); // Observing TAB_CONTENTS_DESTROYED is necessary because it's // possible for tabs to be created, detached and then destroyed without @@ -157,7 +156,7 @@ void ExtensionBrowserEventRouter::RegisterForTabNotifications( void ExtensionBrowserEventRouter::UnregisterForTabNotifications( TabContents* contents) { registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&contents->GetController())); + content::Source<NavigationController>(&contents->controller())); registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, content::Source<TabContents>(contents)); } @@ -542,7 +541,7 @@ void ExtensionBrowserEventRouter::Observe( // Tab was destroyed after being detached (without being re-attached). TabContents* contents = content::Source<TabContents>(source).ptr(); registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&contents->GetController())); + content::Source<NavigationController>(&contents->controller())); registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, content::Source<TabContents>(contents)); } else if (type == chrome::NOTIFICATION_BROWSER_WINDOW_READY) { |