chrome/browser/extensions/api/extension_action/extension_actions_api.cc - Issue 10535077: TabContentsWrapper -> TabContents, part 12.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/extension_action/extension_actions_api.cc

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 6 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/extension_action/extension_actions_api.h ('k') | chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

index 9410fc97b9b826e221fd017dd8ccc03a04844c39..f5fca15424a163857a4c0bf7311fb2e97e71ffe4 100644

--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/extensions/extension_tab_helper.h"

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/profiles/profile.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 "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_action.h"

@@ -84,7 +84,7 @@ bool ExtensionActionFunction::RunImpl() {

}

- // Find the TabContentsWrapper that contains this tab id if one is required.

+ // Find the TabContents that contains this tab id if one is required.

if (tab_id_ == ExtensionAction::kDefaultTabId) {

EXTENSION_FUNCTION_VALIDATE(GetExtension()->browser_action());

} else {