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

Unified Diff: content/renderer/render_view_impl.cc

Issue 17432002: Replace content::ContextMenuSourceType with ui::MenuSourceType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « content/renderer/render_view_impl.h ('k') | content/shell/shell_web_contents_view_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 830370bbcc5614ad4075cbb82874a932a8ab689b..f032550f089e16153b747fc7a53b05152092c276 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -805,7 +805,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
handling_select_range_(false),
next_snapshot_id_(0),
allow_partial_swap_(params->allow_partial_swap),
- context_menu_source_type_(content::CONTEXT_MENU_SOURCE_MOUSE) {
+ context_menu_source_type_(ui::MENU_SOURCE_MOUSE) {
}
void RenderViewImpl::Initialize(RenderViewImplParams* params) {
@@ -2452,7 +2452,7 @@ void RenderViewImpl::showContextMenu(
WebFrame* frame, const WebContextMenuData& data) {
ContextMenuParams params = ContextMenuParamsBuilder::Build(data);
params.source_type = context_menu_source_type_;
- if (context_menu_source_type_ == CONTEXT_MENU_SOURCE_TOUCH_EDIT_MENU) {
+ if (context_menu_source_type_ == ui::MENU_SOURCE_TOUCH_EDIT_MENU) {
params.x = touch_editing_context_menu_location_.x();
params.y = touch_editing_context_menu_location_.y();
}
@@ -5948,7 +5948,7 @@ void RenderViewImpl::DidHandleKeyEvent() {
}
bool RenderViewImpl::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
- context_menu_source_type_ = CONTEXT_MENU_SOURCE_MOUSE;
+ context_menu_source_type_ = ui::MENU_SOURCE_MOUSE;
possible_drag_event_info_.event_source =
ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE;
possible_drag_event_info_.event_location =
@@ -5961,13 +5961,13 @@ bool RenderViewImpl::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
}
bool RenderViewImpl::WillHandleKeyEvent(const WebKit::WebKeyboardEvent& event) {
- context_menu_source_type_ = CONTEXT_MENU_SOURCE_KEYBOARD;
+ context_menu_source_type_ = ui::MENU_SOURCE_KEYBOARD;
return false;
}
bool RenderViewImpl::WillHandleGestureEvent(
const WebKit::WebGestureEvent& event) {
- context_menu_source_type_ = CONTEXT_MENU_SOURCE_TOUCH;
+ context_menu_source_type_ = ui::MENU_SOURCE_TOUCH;
possible_drag_event_info_.event_source =
ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH;
possible_drag_event_info_.event_location =
@@ -6594,7 +6594,7 @@ void RenderViewImpl::OnContextMenuClosed(
}
void RenderViewImpl::OnShowContextMenu(const gfx::Point& location) {
- context_menu_source_type_ = CONTEXT_MENU_SOURCE_TOUCH_EDIT_MENU;
+ context_menu_source_type_ = ui::MENU_SOURCE_TOUCH_EDIT_MENU;
touch_editing_context_menu_location_ = location;
if (webview())
webview()->showContextMenu();
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/shell/shell_web_contents_view_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698