Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc |
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
index 672fde34428a8d52d454ef7d0f498d0586c029df..3f8407c617649cf0db630d83420881d680f0cf4b 100644 |
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
@@ -533,17 +533,17 @@ void RenderViewContextMenu::AppendAllExtensionItems() { |
std::set<MenuItem::ExtensionKey> ids = menu_manager->ExtensionIds(); |
std::vector<base::string16> sorted_menu_titles; |
std::map<base::string16, std::string> map_ids; |
- for (std::set<MenuItem::ExtensionKey>::iterator i = ids.begin(); |
- i != ids.end(); |
- ++i) { |
+ for (std::set<MenuItem::ExtensionKey>::iterator iter = ids.begin(); |
+ iter != ids.end(); |
+ ++iter) { |
const Extension* extension = |
- service->GetExtensionById(i->extension_id, false); |
+ service->GetExtensionById(iter->extension_id, false); |
// Platform apps have their context menus created directly in |
// AppendPlatformAppItems. |
if (extension && !extension->is_platform_app()) { |
base::string16 menu_title = extension_items_.GetTopLevelContextMenuTitle( |
- *i, printable_selection_text); |
- map_ids[menu_title] = i->extension_id; |
+ *iter, printable_selection_text); |
+ map_ids[menu_title] = iter->extension_id; |
sorted_menu_titles.push_back(menu_title); |
} |
} |
@@ -554,17 +554,15 @@ void RenderViewContextMenu::AppendAllExtensionItems() { |
l10n_util::SortStrings16(app_locale, &sorted_menu_titles); |
int index = 0; |
- base::TimeTicks begin = base::TimeTicks::Now(); |
- for (size_t i = 0; i < sorted_menu_titles.size(); ++i) { |
- const std::string& id = map_ids[sorted_menu_titles[i]]; |
- const MenuItem::ExtensionKey extension_key(id); |
- extension_items_.AppendExtensionItems( |
- extension_key, printable_selection_text, &index); |
+ for (std::vector<base::string16>::iterator iter = sorted_menu_titles.begin(); |
+ iter != sorted_menu_titles.end(); |
+ ++iter) { |
+ const std::string& id = map_ids[*iter]; |
+ extension_items_.AppendExtensionItems(MenuItem::ExtensionKey(id), |
+ printable_selection_text, |
+ &index, |
+ true); // include_icons |
Yoyo Zhou
2014/07/15 23:35:00
nit: two spaces before // comments
gpdavis
2014/07/16 01:11:10
Done.
|
} |
- |
- UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime", |
- base::TimeTicks::Now() - begin); |
- UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index); |
} |
void RenderViewContextMenu::AppendCurrentExtensionItems() { |
@@ -577,8 +575,10 @@ void RenderViewContextMenu::AppendCurrentExtensionItems() { |
int index = 0; |
const MenuItem::ExtensionKey key( |
extension->id(), WebViewGuest::GetViewInstanceId(source_web_contents_)); |
- extension_items_.AppendExtensionItems( |
- key, PrintableSelectionText(), &index); |
+ extension_items_.AppendExtensionItems(key, |
+ PrintableSelectionText(), |
+ &index, |
+ true); // include_icons |
} |
} |