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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc 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
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 454
455 void RenderViewContextMenu::AppendCurrentExtensionItems() { 455 void RenderViewContextMenu::AppendCurrentExtensionItems() {
456 // Avoid appending extension related items when |extension| is null. 456 // 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 457 // For Panel, this happens when the panel is navigated to a url outside of the
458 // extension's package. 458 // extension's package.
459 const Extension* extension = GetExtension(); 459 const Extension* extension = GetExtension();
460 if (extension) { 460 if (extension) {
461 // Only add extension items from this extension. 461 // Only add extension items from this extension.
462 int index = 0; 462 int index = 0;
463 const MenuItem::ExtensionKey key( 463 const MenuItem::ExtensionKey key(
464 extension->id(), WebViewGuest::GetViewInstanceId(source_web_contents_)); 464 extension->id(),
465 extensions::WebViewGuest::GetViewInstanceId(source_web_contents_));
465 extension_items_.AppendExtensionItems( 466 extension_items_.AppendExtensionItems(
466 key, PrintableSelectionText(), &index); 467 key, PrintableSelectionText(), &index);
467 } 468 }
468 } 469 }
469 470
470 void RenderViewContextMenu::InitMenu() { 471 void RenderViewContextMenu::InitMenu() {
471 RenderViewContextMenuBase::InitMenu(); 472 RenderViewContextMenuBase::InitMenu();
472 473
473 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE)) 474 if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE))
474 AppendPageItems(); 475 AppendPageItems();
(...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1784 source_web_contents_->GetRenderViewHost()-> 1785 source_web_contents_->GetRenderViewHost()->
1785 ExecuteMediaPlayerActionAtLocation(location, action); 1786 ExecuteMediaPlayerActionAtLocation(location, action);
1786 } 1787 }
1787 1788
1788 void RenderViewContextMenu::PluginActionAt( 1789 void RenderViewContextMenu::PluginActionAt(
1789 const gfx::Point& location, 1790 const gfx::Point& location,
1790 const WebPluginAction& action) { 1791 const WebPluginAction& action) {
1791 source_web_contents_->GetRenderViewHost()-> 1792 source_web_contents_->GetRenderViewHost()->
1792 ExecutePluginActionAtLocation(location, action); 1793 ExecutePluginActionAtLocation(location, action);
1793 } 1794 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698