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

Unified Diff: Source/web/ContextMenuClientImpl.cpp

Issue 183693004: Move showContextMenu from WebViewClient to WebFrameClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update with workaround for clang warning 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
« no previous file with comments | « no previous file | public/web/WebFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ContextMenuClientImpl.cpp
diff --git a/Source/web/ContextMenuClientImpl.cpp b/Source/web/ContextMenuClientImpl.cpp
index 8f16ffa83ec1e189f9df7a13b6ce4d83b9a96e69..9dee300e67cfa86e45a59c825fa77a6907256aa0 100644
--- a/Source/web/ContextMenuClientImpl.cpp
+++ b/Source/web/ContextMenuClientImpl.cpp
@@ -36,6 +36,7 @@
#include "WebContextMenuData.h"
#include "WebDataSourceImpl.h"
#include "WebFormElement.h"
+#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebMenuItemInfo.h"
#include "WebPlugin.h"
@@ -365,9 +366,9 @@ void ContextMenuClientImpl::showContextMenu(const WebCore::ContextMenu* defaultM
data.node = r.innerNonSharedNode();
- WebFrame* selected_web_frame = WebFrameImpl::fromFrame(selectedFrame);
- if (m_webView->client())
- m_webView->client()->showContextMenu(selected_web_frame, data);
+ WebFrameImpl* selectedWebFrame = WebFrameImpl::fromFrame(selectedFrame);
+ if (selectedWebFrame->client())
+ selectedWebFrame->client()->showContextMenu(data);
}
void ContextMenuClientImpl::clearContextMenu()
« no previous file with comments | « no previous file | public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698