diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
| commit | 69cda6547de3c2bc25e6476607e7550ba548cac9 (patch) | |
| tree | e54f39838f04e0e61921cd7457711019be8b545f /chrome/browser/extensions/extension_browser_event_router.cc | |
| parent | c691a593ac199d774a43f239342cd85c80ca1a2a (diff) | |
| download | chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.zip chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.gz chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.bz2 | |
Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115276 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, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 2cfa328..a415f5b 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -142,8 +142,9 @@ void ExtensionBrowserEventRouter::RegisterForBrowserNotifications( void ExtensionBrowserEventRouter::RegisterForTabNotifications( TabContents* contents) { - registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&contents->controller())); + registrar_.Add( + this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, + content::Source<NavigationController>(&contents->GetController())); // Observing TAB_CONTENTS_DESTROYED is necessary because it's // possible for tabs to be created, detached and then destroyed without @@ -156,7 +157,7 @@ void ExtensionBrowserEventRouter::RegisterForTabNotifications( void ExtensionBrowserEventRouter::UnregisterForTabNotifications( TabContents* contents) { registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&contents->controller())); + content::Source<NavigationController>(&contents->GetController())); registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, content::Source<TabContents>(contents)); } @@ -541,7 +542,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->controller())); + content::Source<NavigationController>(&contents->GetController())); registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, content::Source<TabContents>(contents)); } else if (type == chrome::NOTIFICATION_BROWSER_WINDOW_READY) { |