summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tab_id_map.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 01:53:30 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 01:53:30 +0000
commitb62084b5b4cc4923e8007495a482839a94c3704f (patch)
tree0af405b028f7af0e751301d18cf7c8c674a8aa36 /chrome/browser/extensions/extension_tab_id_map.cc
parent6be34a67b24aef48908eeaa99643a180359309dc (diff)
downloadchromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.zip
chromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.tar.gz
chromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.tar.bz2
TabContentsWrapper -> TabContents, part 12.
Extensions. BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10535077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tab_id_map.cc')
-rw-r--r--chrome/browser/extensions/extension_tab_id_map.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc
index 5ede659..9948405 100644
--- a/chrome/browser/extensions/extension_tab_id_map.cc
+++ b/chrome/browser/extensions/extension_tab_id_map.cc
@@ -8,7 +8,7 @@
#include "base/bind_helpers.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
#include "chrome/browser/tab_contents/retargeting_details.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_details.h"
@@ -67,8 +67,7 @@ void ExtensionTabIdMap::TabObserver::Observe(
switch (type) {
case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
WebContents* contents = content::Source<WebContents>(source).ptr();
- TabContentsWrapper* tab =
- TabContentsWrapper::GetCurrentWrapperForContents(contents);
+ TabContents* tab = TabContents::FromWebContents(contents);
if (!tab)
break;
RenderViewHost* host = content::Details<RenderViewHost>(details).ptr();
@@ -85,8 +84,8 @@ void ExtensionTabIdMap::TabObserver::Observe(
break;
}
case chrome::NOTIFICATION_TAB_PARENTED: {
- TabContentsWrapper* tab =
- content::Source<TabContentsWrapper>(source).ptr();
+ TabContents* tab =
+ content::Source<TabContents>(source).ptr();
RenderViewHost* host = tab->web_contents()->GetRenderViewHost();
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -102,8 +101,7 @@ void ExtensionTabIdMap::TabObserver::Observe(
RetargetingDetails* retargeting_details =
content::Details<RetargetingDetails>(details).ptr();
WebContents* contents = retargeting_details->target_web_contents;
- TabContentsWrapper* tab =
- TabContentsWrapper::GetCurrentWrapperForContents(contents);
+ TabContents* tab = TabContents::FromWebContents(contents);
if (!tab)
break;
RenderViewHost* host = contents->GetRenderViewHost();