Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2036)

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc

Issue 11308012: Remove some TabContentses from extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs.cc ('k') | chrome/browser/extensions/browser_event_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index 00e66d1a22ebedf896e3ce33561b78418037f005..5e3f1adc3c4a76a4061f1bafdb69518de06cf43e 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -648,18 +648,17 @@ bool GetFrameFunction::RunImpl() {
SetResult(Value::CreateNullValue());
- TabContents* tab_contents;
+ content::WebContents* web_contents;
if (!ExtensionTabUtil::GetTabById(tab_id,
profile(),
include_incognito(),
NULL, NULL,
- &tab_contents,
+ &web_contents,
NULL) ||
- !tab_contents) {
+ !web_contents) {
return true;
}
- content::WebContents* web_contents = tab_contents->web_contents();
WebNavigationTabObserver* observer =
WebNavigationTabObserver::Get(web_contents);
DCHECK(observer);
@@ -703,18 +702,17 @@ bool GetAllFramesFunction::RunImpl() {
SetResult(Value::CreateNullValue());
- TabContents* tab_contents;
+ content::WebContents* web_contents;
if (!ExtensionTabUtil::GetTabById(tab_id,
profile(),
include_incognito(),
NULL, NULL,
- &tab_contents,
+ &web_contents,
NULL) ||
- !tab_contents) {
+ !web_contents) {
return true;
}
- content::WebContents* web_contents = tab_contents->web_contents();
WebNavigationTabObserver* observer =
WebNavigationTabObserver::Get(web_contents);
DCHECK(observer);
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs.cc ('k') | chrome/browser/extensions/browser_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698