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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 183923030: Almost finish moving context_menu_node_ from RenderViewImpl to RenderFrameImpl. (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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 navigation_overlay_.reset(); 1139 navigation_overlay_.reset();
1140 else if (!navigation_overlay_) 1140 else if (!navigation_overlay_)
1141 navigation_overlay_.reset(new OverscrollNavigationOverlay(web_contents_)); 1141 navigation_overlay_.reset(new OverscrollNavigationOverlay(web_contents_));
1142 } 1142 }
1143 1143
1144 //////////////////////////////////////////////////////////////////////////////// 1144 ////////////////////////////////////////////////////////////////////////////////
1145 // WebContentsViewAura, RenderViewHostDelegateView implementation: 1145 // WebContentsViewAura, RenderViewHostDelegateView implementation:
1146 1146
1147 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host, 1147 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host,
1148 const ContextMenuParams& params) { 1148 const ContextMenuParams& params) {
1149 if (touch_editable_) 1149 if (touch_editable_) {
1150 touch_editable_->EndTouchEditing(false); 1150 touch_editable_->EndTouchEditing(false);
1151 touch_editable_->SetContextMenuRenderFrameID(
1152 render_frame_host->GetProcess()->GetID(),
1153 render_frame_host->GetRoutingID());
1154 }
1151 if (delegate_) { 1155 if (delegate_) {
1152 delegate_->ShowContextMenu(render_frame_host, params); 1156 delegate_->ShowContextMenu(render_frame_host, params);
1153 // WARNING: we may have been deleted during the call to ShowContextMenu(). 1157 // WARNING: we may have been deleted during the call to ShowContextMenu().
1154 } 1158 }
1155 } 1159 }
1156 1160
1157 void WebContentsViewAura::ShowPopupMenu(const gfx::Rect& bounds, 1161 void WebContentsViewAura::ShowPopupMenu(const gfx::Rect& bounds,
1158 int item_height, 1162 int item_height,
1159 double item_font_size, 1163 double item_font_size,
1160 int selected_item, 1164 int selected_item,
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 event.location(), 1539 event.location(),
1536 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 1540 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
1537 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 1541 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
1538 if (drag_dest_delegate_) 1542 if (drag_dest_delegate_)
1539 drag_dest_delegate_->OnDrop(); 1543 drag_dest_delegate_->OnDrop();
1540 current_drop_data_.reset(); 1544 current_drop_data_.reset();
1541 return ConvertFromWeb(current_drag_op_); 1545 return ConvertFromWeb(current_drag_op_);
1542 } 1546 }
1543 1547
1544 } // namespace content 1548 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698