chrome/browser/extensions/browser_event_router.cc - Issue 11638022: Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI

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

Issue 11638022: Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_script_badge

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:

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

Download patch

« chrome/browser/extensions/api/extension_action/extension_action_api_constants.h ('K') | « chrome/browser/extensions/api/system_indicator/system_indicator_api.h ('k') | chrome/browser/extensions/extension_function_registry.cc » ('j') | chrome/browser/extensions/extension_function_registry.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/browser_event_router.cc

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

index cc33832268da0ac2da252a90a1707a744623918e..1c2c42a57b37ae64a3e971c04eb3547bbc1d6844 100644

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

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

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

#include "base/json/json_writer.h"

#include "base/values.h"

-#include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"

+#include "chrome/browser/extensions/api/extension_action/extension_action_api_constants.h"

#include "chrome/browser/extensions/api/tabs/tabs_constants.h"

#include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"

#include "chrome/browser/extensions/api/tabs/windows_event_router.h"

@@ -30,7 +30,7 @@

namespace events = extensions::event_names;

namespace tab_keys = extensions::tabs_constants;

-namespace page_action_keys = extension_page_actions_api_constants;

+namespace extension_action_keys = extension_action_api_constants;

using content::NavigationController;

using content::WebContents;

@@ -503,7 +503,8 @@ void BrowserEventRouter::DispatchOldPageActionEvent(

DictionaryValue* data = new DictionaryValue();

data->Set(tab_keys::kTabIdKey, Value::CreateIntegerValue(tab_id));

data->Set(tab_keys::kTabUrlKey, Value::CreateStringValue(url));

- data->Set(page_action_keys::kButtonKey, Value::CreateIntegerValue(button));

+ data->Set(extension_action_keys::kButtonKey,

+ Value::CreateIntegerValue(button));

args->Append(data);

DispatchEventToExtension(profile, extension_id, "pageActions", args.Pass(),