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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 177923011: Chromium side of moving clearContextMenu from WebViewClient to WebFrameClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 gfx::Rect start_rect; 1701 gfx::Rect start_rect;
1702 gfx::Rect end_rect; 1702 gfx::Rect end_rect;
1703 render_view_->GetSelectionBounds(&start_rect, &end_rect); 1703 render_view_->GetSelectionBounds(&start_rect, &end_rect);
1704 params.selection_start = gfx::Point(start_rect.x(), start_rect.bottom()); 1704 params.selection_start = gfx::Point(start_rect.x(), start_rect.bottom());
1705 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom()); 1705 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom());
1706 #endif 1706 #endif
1707 1707
1708 Send(new FrameHostMsg_ContextMenu(routing_id_, params)); 1708 Send(new FrameHostMsg_ContextMenu(routing_id_, params));
1709 } 1709 }
1710 1710
1711 void RenderFrameImpl::clearContextMenu() {
1712 render_view_->context_menu_node_.reset();
1713 }
1714
1711 void RenderFrameImpl::willRequestAfterPreconnect( 1715 void RenderFrameImpl::willRequestAfterPreconnect(
1712 blink::WebFrame* frame, 1716 blink::WebFrame* frame,
1713 blink::WebURLRequest& request) { 1717 blink::WebURLRequest& request) {
1714 DCHECK(!frame_ || frame_ == frame); 1718 DCHECK(!frame_ || frame_ == frame);
1715 // FIXME(kohei): This will never be set. 1719 // FIXME(kohei): This will never be set.
1716 WebString custom_user_agent; 1720 WebString custom_user_agent;
1717 1721
1718 DCHECK(!request.extraData()); 1722 DCHECK(!request.extraData());
1719 1723
1720 bool was_after_preconnect_request = true; 1724 bool was_after_preconnect_request = true;
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
2619 policy == blink::WebNavigationPolicyNewForegroundTab || 2623 policy == blink::WebNavigationPolicyNewForegroundTab ||
2620 policy == blink::WebNavigationPolicyNewWindow || 2624 policy == blink::WebNavigationPolicyNewWindow ||
2621 policy == blink::WebNavigationPolicyNewPopup) { 2625 policy == blink::WebNavigationPolicyNewPopup) {
2622 WebUserGestureIndicator::consumeUserGesture(); 2626 WebUserGestureIndicator::consumeUserGesture();
2623 } 2627 }
2624 2628
2625 Send(new FrameHostMsg_OpenURL(routing_id_, params)); 2629 Send(new FrameHostMsg_OpenURL(routing_id_, params));
2626 } 2630 }
2627 2631
2628 } // namespace content 2632 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698