chrome/browser/extensions/api/extension_action/extension_page_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_page_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.cc ('k') | chrome/browser/extensions/api/extension_action/page_action_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 52f4dd55fe0501bf5f5a83b3011c2c06bafca47e..a5a9cbb9d24e3dbfdf5db44054e2a59a973486aa 100644

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

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

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

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_list.h"

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/tab_contents.h"

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

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

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

@@ -75,8 +75,8 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {

return false;

}

- // Find the TabContentsWrapper that contains this tab id.

- TabContentsWrapper* contents = NULL;

+ // Find the TabContents that contains this tab id.

+ TabContents* contents = NULL;

bool result = ExtensionTabUtil::GetTabById(

tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);

if (!result || !contents) {