summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_menu_manager_unittest.cc
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 16:56:00 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 16:56:00 +0000
commita11fa3437fdbb89ebe1e3a61cb4fc1de1ae4a352 (patch)
treecf59a7210e075e77c80d0e4e14b30277913e9715 /chrome/browser/extensions/extension_menu_manager_unittest.cc
parent5eb3572ff444cac4f5b78a6b7db26198476d11b6 (diff)
downloadchromium_src-a11fa3437fdbb89ebe1e3a61cb4fc1de1ae4a352.zip
chromium_src-a11fa3437fdbb89ebe1e3a61cb4fc1de1ae4a352.tar.gz
chromium_src-a11fa3437fdbb89ebe1e3a61cb4fc1de1ae4a352.tar.bz2
Some cleanup of the extensions context menu API.
This CL contains the following: -Use lower case names for enum values in the create/update properties (eg 'page' instead of 'PAGE') -Make the top-level API name plural (contextMenus instead of contextMenu) -Don't fire onclick handlers for a parent menu item when one of its children is clicked on. -Remove the enabledContexts property for now, to eventually be replaced with a way to programmatically enable/disable. There are a few more things in the bug that I'll be doing in subsequent CL's. BUG=48198 TEST=Extensions using the context menu API should work with the changes described above. Review URL: http://codereview.chromium.org/2887013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_menu_manager_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index a03702a..f0960cb 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -36,9 +36,8 @@ class ExtensionMenuManagerTest : public testing::Test {
static ExtensionMenuItem* CreateTestItem(Extension* extension) {
ExtensionMenuItem::Type type = ExtensionMenuItem::NORMAL;
ExtensionMenuItem::ContextList contexts(ExtensionMenuItem::ALL);
- ExtensionMenuItem::ContextList enabled_contexts = contexts;
- return new ExtensionMenuItem(extension->id(), "test", false, type, contexts,
- enabled_contexts);
+ return new ExtensionMenuItem(extension->id(), "test", false, type,
+ contexts);
}
// Creates and returns a test Extension. The caller does *not* own the return
@@ -363,7 +362,7 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) {
// Use the magic of googlemock to save a parameter to our mock's
// DispatchEventToRenderers method into event_args.
std::string event_args;
- std::string expected_event_name = "contextMenu/" + item->extension_id();
+ std::string expected_event_name = "contextMenus/" + item->extension_id();
EXPECT_CALL(*mock_message_service.get(),
DispatchEventToRenderers(expected_event_name, _,
profile.IsOffTheRecord(),