Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: chrome/browser/extensions/extension_context_menu_browsertest.cc

Issue 186213003: <webview>: Context menu API implementation CL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added test + fixed MenuManager::ExtensionIds(). Created 6 years, 10 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
Index: chrome/browser/extensions/extension_context_menu_browsertest.cc
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index 9114cf1a28d5df93191d5e5b175d89a3860dc797..19374a56743c965218b09acc5d0f4e8fccc3f4f6 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -149,8 +149,9 @@ class ExtensionContextMenuBrowserTest : public ExtensionBrowserTest {
// inclusion in context menus.
MenuItem::List GetItems() {
MenuItem::List result;
- std::set<std::string> extension_ids = menu_manager()->ExtensionIds();
- std::set<std::string>::iterator i;
+ std::set<MenuItem::ExtensionKey> extension_ids =
+ menu_manager()->ExtensionIds();
+ std::set<MenuItem::ExtensionKey>::iterator i;
for (i = extension_ids.begin(); i != extension_ids.end(); ++i) {
const MenuItem::List* list = menu_manager()->MenuItems(*i);
result.insert(result.end(), list->begin(), list->end());
@@ -634,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserLazyTest, EventPage) {
LazyBackgroundObserver checkbox_checked;
scoped_ptr<TestRenderViewContextMenu> menu(
CreateMenu(browser(), about_blank, GURL(), GURL()));
- MenuItem::Id id(false, extension->id());
+ MenuItem::Id id(false, MenuItem::ExtensionKey(extension->id()));
id.string_uid = "checkbox1";
int command_id = -1;
ASSERT_TRUE(FindCommandId(menu.get(), id, &command_id));

Powered by Google App Engine
This is Rietveld 408576698