chrome/browser/extensions/extension_action_manager.cc - Issue 11644057: Move BrowserAction out of Extension

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/extension_action_manager.cc

Issue 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action

Patch Set: Created 8 years 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/extensions/extension_action_manager.cc

diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc

index 41018bfb5125c9b8772e423214a896c0b77e660c..c7d5d1a1d3f8a1fb717206b6177fbcf4026dc5ab 100644

--- a/chrome/browser/extensions/extension_action_manager.cc

+++ b/chrome/browser/extensions/extension_action_manager.cc

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

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

#include "chrome/common/chrome_notification_types.h"

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

+#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"

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

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

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

@@ -130,7 +131,8 @@ ExtensionAction* ExtensionActionManager::GetPageAction(

ExtensionAction* ExtensionActionManager::GetBrowserAction(

const extensions::Extension& extension) const {

- const ActionInfo* action_info = extension.browser_action_info();

+ const ActionInfo* action_info =

+ BrowserActionInfo::GetBrowserAction(&extension);

ActionInfo::Type action_type = ActionInfo::TYPE_BROWSER;

if (FeatureSwitch::script_badges()->IsEnabled() &&

extension.page_action_info()) {