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

Side by Side Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 359493005: Extend contextMenus API to support browser/page actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 5 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
11 #include "apps/app_load_service.h" 11 #include "apps/app_load_service.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/prefs/pref_member.h" 15 #include "base/prefs/pref_member.h"
16 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/strings/stringprintf.h" 19 #include "base/strings/stringprintf.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "base/time/time.h"
22 #include "chrome/app/chrome_command_ids.h" 21 #include "chrome/app/chrome_command_ids.h"
23 #include "chrome/browser/app_mode/app_mode_utils.h" 22 #include "chrome/browser/app_mode/app_mode_utils.h"
24 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 23 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
25 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 24 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
26 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
27 #include "chrome/browser/chrome_notification_types.h" 26 #include "chrome/browser/chrome_notification_types.h"
28 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 27 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
29 #include "chrome/browser/devtools/devtools_window.h" 28 #include "chrome/browser/devtools/devtools_window.h"
30 #include "chrome/browser/download/download_service.h" 29 #include "chrome/browser/download/download_service.h"
31 #include "chrome/browser/download/download_service_factory.h" 30 #include "chrome/browser/download/download_service_factory.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 return; 410 return;
412 411
413 base::string16 printable_selection_text = PrintableSelectionText(); 412 base::string16 printable_selection_text = PrintableSelectionText();
414 EscapeAmpersands(&printable_selection_text); 413 EscapeAmpersands(&printable_selection_text);
415 414
416 // Get a list of extension id's that have context menu items, and sort by the 415 // Get a list of extension id's that have context menu items, and sort by the
417 // top level context menu title of the extension. 416 // top level context menu title of the extension.
418 std::set<MenuItem::ExtensionKey> ids = menu_manager->ExtensionIds(); 417 std::set<MenuItem::ExtensionKey> ids = menu_manager->ExtensionIds();
419 std::vector<base::string16> sorted_menu_titles; 418 std::vector<base::string16> sorted_menu_titles;
420 std::map<base::string16, std::string> map_ids; 419 std::map<base::string16, std::string> map_ids;
421 for (std::set<MenuItem::ExtensionKey>::iterator i = ids.begin(); 420 for (std::set<MenuItem::ExtensionKey>::iterator iter = ids.begin();
422 i != ids.end(); 421 iter != ids.end();
423 ++i) { 422 ++iter) {
424 const Extension* extension = 423 const Extension* extension =
425 service->GetExtensionById(i->extension_id, false); 424 service->GetExtensionById(iter->extension_id, false);
426 // Platform apps have their context menus created directly in 425 // Platform apps have their context menus created directly in
427 // AppendPlatformAppItems. 426 // AppendPlatformAppItems.
428 if (extension && !extension->is_platform_app()) { 427 if (extension && !extension->is_platform_app()) {
429 base::string16 menu_title = extension_items_.GetTopLevelContextMenuTitle( 428 base::string16 menu_title = extension_items_.GetTopLevelContextMenuTitle(
430 *i, printable_selection_text); 429 *iter, printable_selection_text);
431 map_ids[menu_title] = i->extension_id; 430 map_ids[menu_title] = iter->extension_id;
432 sorted_menu_titles.push_back(menu_title); 431 sorted_menu_titles.push_back(menu_title);
433 } 432 }
434 } 433 }
435 if (sorted_menu_titles.empty()) 434 if (sorted_menu_titles.empty())
436 return; 435 return;
437 436
438 const std::string app_locale = g_browser_process->GetApplicationLocale(); 437 const std::string app_locale = g_browser_process->GetApplicationLocale();
439 l10n_util::SortStrings16(app_locale, &sorted_menu_titles); 438 l10n_util::SortStrings16(app_locale, &sorted_menu_titles);
440 439
441 int index = 0; 440 int index = 0;
442 base::TimeTicks begin = base::TimeTicks::Now();
443 for (size_t i = 0; i < sorted_menu_titles.size(); ++i) { 441 for (size_t i = 0; i < sorted_menu_titles.size(); ++i) {
444 const std::string& id = map_ids[sorted_menu_titles[i]]; 442 const std::string& id = map_ids[sorted_menu_titles[i]];
445 const MenuItem::ExtensionKey extension_key(id); 443 const MenuItem::ExtensionKey extension_key(id);
446 extension_items_.AppendExtensionItems( 444 extension_items_.AppendExtensionItems(extension_key,
447 extension_key, printable_selection_text, &index); 445 printable_selection_text,
446 &index,
447 false); // is_action_menu
448 } 448 }
449
450 UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime",
451 base::TimeTicks::Now() - begin);
452 UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index);
453 } 449 }
454 450
455 void RenderViewContextMenu::AppendCurrentExtensionItems() { 451 void RenderViewContextMenu::AppendCurrentExtensionItems() {
456 // Avoid appending extension related items when |extension| is null. 452 // Avoid appending extension related items when |extension| is null.
457 // For Panel, this happens when the panel is navigated to a url outside of the 453 // For Panel, this happens when the panel is navigated to a url outside of the
458 // extension's package. 454 // extension's package.
459 const Extension* extension = GetExtension(); 455 const Extension* extension = GetExtension();
460 if (extension) { 456 if (extension) {
461 // Only add extension items from this extension. 457 // Only add extension items from this extension.
462 int index = 0; 458 int index = 0;
463 const MenuItem::ExtensionKey key( 459 const MenuItem::ExtensionKey key(
464 extension->id(), 460 extension->id(),
465 extensions::WebViewGuest::GetViewInstanceId(source_web_contents_)); 461 extensions::WebViewGuest::GetViewInstanceId(source_web_contents_));
466 extension_items_.AppendExtensionItems( 462 extension_items_.AppendExtensionItems(key,
467 key, PrintableSelectionText(), &index); 463 PrintableSelectionText(),
464 &index,
465 false); // is_action_menu
468 } 466 }
469 } 467 }
470 468
471 void RenderViewContextMenu::InitMenu() { 469 void RenderViewContextMenu::InitMenu() {
472 RenderViewContextMenuBase::InitMenu(); 470 RenderViewContextMenuBase::InitMenu();
473 471
474 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE)) 472 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE))
475 AppendPageItems(); 473 AppendPageItems();
476 474
477 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_FRAME)) { 475 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_FRAME)) {
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1785 source_web_contents_->GetRenderViewHost()-> 1783 source_web_contents_->GetRenderViewHost()->
1786 ExecuteMediaPlayerActionAtLocation(location, action); 1784 ExecuteMediaPlayerActionAtLocation(location, action);
1787 } 1785 }
1788 1786
1789 void RenderViewContextMenu::PluginActionAt( 1787 void RenderViewContextMenu::PluginActionAt(
1790 const gfx::Point& location, 1788 const gfx::Point& location,
1791 const WebPluginAction& action) { 1789 const WebPluginAction& action) {
1792 source_web_contents_->GetRenderViewHost()-> 1790 source_web_contents_->GetRenderViewHost()->
1793 ExecutePluginActionAtLocation(location, action); 1791 ExecutePluginActionAtLocation(location, action);
1794 } 1792 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/menu_manager_factory.cc ('k') | chrome/browser/ui/app_list/app_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698