diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-26 19:06:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-26 19:06:17 +0000 |
| commit | 768c547ef7c680bcfcf2616bf6e833849aea6db1 (patch) | |
| tree | 6264e6274a36648ac8b5af51d2d02fc38dff5b2c /chrome/browser/extensions | |
| parent | c95c0219b5d1ea69f824c9b98d63919cba7ccd10 (diff) | |
| download | chromium_src-768c547ef7c680bcfcf2616bf6e833849aea6db1.zip chromium_src-768c547ef7c680bcfcf2616bf6e833849aea6db1.tar.gz chromium_src-768c547ef7c680bcfcf2616bf6e833849aea6db1.tar.bz2 | |
Move most of the remaining users of WebContentsObserver::tab_contents() to use web_contents().
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9030010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_module.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_webnavigation_api.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 97ffa2d..85ff76a 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -1630,7 +1630,7 @@ bool DetectTabLanguageFunction::RunImpl() { // The tab contents does not know its language yet. Let's wait until it // receives it, or until the tab is closed/navigates to some other page. registrar_.Add(this, chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, - content::Source<TabContents>(contents->tab_contents())); + content::Source<WebContents>(contents->tab_contents())); registrar_.Add( this, content::NOTIFICATION_TAB_CLOSING, content::Source<NavigationController>( diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index a74d742..87df8e5 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -416,8 +416,8 @@ void ExtensionWebNavigationEventRouter::Retargeting( ExtensionWebNavigationTabObserver* tab_observer = ExtensionWebNavigationTabObserver::Get(details->source_web_contents); if (!tab_observer) { - CHECK(details->source_web_contents->GetRenderViewHost()->delegate()-> - GetRenderViewType() != content::VIEW_TYPE_TAB_CONTENTS); + CHECK(details->source_web_contents->GetViewType() != + content::VIEW_TYPE_TAB_CONTENTS); return; } const FrameNavigationState& frame_navigation_state = |