chrome/browser/extensions/api/extension_action/extension_action_api.cc - Issue 1241063003: Support Component Actions in the toolbar.

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_action_api.cc

Issue 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Switch GetComponentActionId to unix_hacker_style. Created 5 years, 4 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/browser_action_interactive_test.cc ('k') | chrome/browser/extensions/browser_context_keyed_service_factories.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8c151a9c00f87d7b5c74b338edaf28b3390837f6..0736edffeff644e904cf7be71dc7c5542e42be69 100644

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

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

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

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

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

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

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

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

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

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

@@ -23,6 +22,7 @@

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

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"

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

#include "content/public/browser/notification_service.h"

#include "extensions/browser/event_router.h"

@@ -228,9 +228,9 @@ bool ExtensionActionAPI::ShowExtensionActionPopup(

return browser->window()->GetLocationBar()->ShowPageActionPopup(

extension, grant_active_tab_permissions);

} else {

- return ExtensionToolbarModel::Get(browser->profile())->

- ShowExtensionActionPopup(

- extension, browser, grant_active_tab_permissions);

+ return ToolbarActionsModel::Get(browser->profile())

+ ->ShowToolbarActionPopup(extension->id(), browser,

+ grant_active_tab_permissions);

}