chrome/browser/ui/tab_contents/tab_contents_wrapper.cc - Issue 10388160: Only return the visible page actions from PageActionController.

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/ui/tab_contents/tab_contents_wrapper.cc

Issue 10388160: Only return the visible page actions from PageActionController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: actually fix Created 8 years, 7 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:

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

index 365ca3a3e649da561361c622e4ca61c0e4c8b430..2010a4346ee8dc0dd6f7d856e2f7c626ac2e5393 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

@@ -14,8 +14,6 @@

#include "chrome/browser/download/download_request_limiter_observer.h"

#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"

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

-#include "chrome/browser/extensions/page_action_controller.h"

-#include "chrome/browser/extensions/script_executor_impl.h"

#include "chrome/browser/external_protocol/external_protocol_observer.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/history/history_tab_helper.h"

@@ -95,10 +93,6 @@ TabContentsWrapper::TabContentsWrapper(WebContents* contents)

constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));

core_tab_helper_.reset(new CoreTabHelper(contents));

extension_tab_helper_.reset(new ExtensionTabHelper(this));

- extension_script_executor_.reset(

- new extensions::ScriptExecutorImpl(web_contents()));

- extension_action_box_controller_.reset(

- new extensions::PageActionController(this));

favicon_tab_helper_.reset(new FaviconTabHelper(contents));

find_tab_helper_.reset(new FindTabHelper(contents));

history_tab_helper_.reset(new HistoryTabHelper(contents));