chrome/browser/ui/tab_contents/tab_contents_wrapper.cc - Issue 10381105: Refactor UI "badge" (page action) logic into a BadgeController interface.

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 10381105: Refactor UI "badge" (page action) logic into a BadgeController interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: dont include badgecontroller.h 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/page_action_controller.cc ('K') | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5e457eaf586263e332e26a40d2652d5280aa4942..730a4b4f278deec5a7173e087a26e5e3222cc362 100644

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

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

@@ -12,8 +12,9 @@

#include "chrome/browser/automation/automation_tab_helper.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

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

-#include "chrome/browser/extensions/extension_tab_helper.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/external_protocol/external_protocol_observer.h"

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

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

@@ -90,6 +91,8 @@ 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));

+ extensions_badge_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));