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

Unified Diff: chrome/browser/extensions/api/debugger/debugger_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
Index: chrome/browser/extensions/api/debugger/debugger_api.cc
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index 8c06f5ee446831b11ad9de275c0a378a3dafb63a..27557af0809d24ee49922e000e445366ed69589a 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/infobars/infobar.h"
#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/api/debugger.h"
@@ -407,19 +406,19 @@ DebuggerFunction::DebuggerFunction()
client_host_(0) {
}
-bool DebuggerFunction::InitTabContents() {
- // Find the TabContents that contains this tab id.
+bool DebuggerFunction::InitWebContents() {
+ // Find the WebContents that contains this tab id.
contents_ = NULL;
- TabContents* tab_contents = NULL;
+ WebContents* web_contents = NULL;
bool result = ExtensionTabUtil::GetTabById(
- tab_id_, profile(), include_incognito(), NULL, NULL, &tab_contents, NULL);
- if (!result || !tab_contents) {
+ tab_id_, profile(), include_incognito(), NULL, NULL, &web_contents, NULL);
+ if (!result || !web_contents) {
error_ = ExtensionErrorUtils::FormatErrorMessage(
keys::kNoTabError,
base::IntToString(tab_id_));
return false;
}
- contents_ = tab_contents->web_contents();
+ contents_ = web_contents;
if (content::GetContentClient()->HasWebUIScheme(
contents_->GetURL())) {
@@ -433,7 +432,7 @@ bool DebuggerFunction::InitTabContents() {
}
bool DebuggerFunction::InitClientHost() {
- if (!InitTabContents())
+ if (!InitWebContents())
return false;
// Don't fetch rvh from the contents since it'll be wrong upon navigation.
@@ -459,7 +458,7 @@ bool AttachDebuggerFunction::RunImpl() {
EXTENSION_FUNCTION_VALIDATE(params.get());
tab_id_ = params->target.tab_id;
- if (!InitTabContents())
+ if (!InitWebContents())
return false;
if (!webkit_glue::IsInspectorProtocolVersionSupported(

Powered by Google App Engine
This is Rietveld 408576698