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

Unified Diff: chrome/browser/infobars/infobar_extension_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/extension_tab_util_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/infobars/infobar_extension_api.cc
diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc
index 797cdb351931963407db39b1e20ec992062a8346..fe6d5786577d5ab2b86c443ffaf81fae2e621991 100644
--- a/chrome/browser/infobars/infobar_extension_api.cc
+++ b/chrome/browser/infobars/infobar_extension_api.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/extensions/window_controller.h"
#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_error_utils.h"
#include "chrome/common/url_constants.h"
@@ -53,14 +52,14 @@ bool ShowInfoBarFunction::RunImpl() {
GURL url = extension->GetResourceURL(extension->url(), html_path);
Browser* browser = NULL;
- TabContents* tab_contents = NULL;
+ content::WebContents* web_contents = NULL;
if (!ExtensionTabUtil::GetTabById(
tab_id,
profile(),
include_incognito(),
&browser,
NULL,
- &tab_contents,
+ &web_contents,
NULL)) {
error_ = ExtensionErrorUtils::FormatErrorMessage(
extensions::tabs_constants::kTabNotFoundError,
@@ -69,7 +68,7 @@ bool ShowInfoBarFunction::RunImpl() {
}
InfoBarTabHelper* infobar_tab_helper =
- InfoBarTabHelper::FromWebContents(tab_contents->web_contents());
+ InfoBarTabHelper::FromWebContents(web_contents);
infobar_tab_helper->AddInfoBar(
new ExtensionInfoBarDelegate(browser, infobar_tab_helper,
GetExtension(), url, height));
« no previous file with comments | « chrome/browser/extensions/extension_tab_util_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698