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

Unified Diff: Source/core/page/ContextMenuController.cpp

Issue 14495011: Revert "Create errors (especially cancellation errors) internally to WebCore, rather" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
« no previous file with comments | « Source/core/loader/ResourceLoader.cpp ('k') | Source/core/platform/network/ResourceError.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/ContextMenuController.cpp
diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp
index 6010a9f855afdc0f3a595486704c09a97d20244c..6d3dc1b5856b5b1ddab668601ab6c4e7a2744664 100644
--- a/Source/core/page/ContextMenuController.cpp
+++ b/Source/core/page/ContextMenuController.cpp
@@ -544,9 +544,11 @@ void ContextMenuController::populate()
FrameLoader* loader = frame->loader();
KURL linkURL = m_hitTestResult.absoluteLinkURL();
if (!linkURL.isEmpty()) {
- appendItem(OpenLinkItem, m_contextMenu.get());
- appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
- appendItem(DownloadFileItem, m_contextMenu.get());
+ if (loader->client()->canHandleRequest(ResourceRequest(linkURL))) {
+ appendItem(OpenLinkItem, m_contextMenu.get());
+ appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
+ appendItem(DownloadFileItem, m_contextMenu.get());
+ }
appendItem(CopyLinkItem, m_contextMenu.get());
}
@@ -659,11 +661,14 @@ void ContextMenuController::populate()
}
}
+ FrameLoader* loader = frame->loader();
KURL linkURL = m_hitTestResult.absoluteLinkURL();
if (!linkURL.isEmpty()) {
- appendItem(OpenLinkItem, m_contextMenu.get());
- appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
- appendItem(DownloadFileItem, m_contextMenu.get());
+ if (loader->client()->canHandleRequest(ResourceRequest(linkURL))) {
+ appendItem(OpenLinkItem, m_contextMenu.get());
+ appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
+ appendItem(DownloadFileItem, m_contextMenu.get());
+ }
appendItem(CopyLinkItem, m_contextMenu.get());
appendItem(*separatorItem(), m_contextMenu.get());
}
« no previous file with comments | « Source/core/loader/ResourceLoader.cpp ('k') | Source/core/platform/network/ResourceError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698