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

Unified Diff: content/renderer/render_widget_fullscreen_pepper.cc

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix new instances Created 4 years, 4 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_browsertest.cc ('k') | content/renderer/webscrollbarbehavior_impl_gtkoraura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget_fullscreen_pepper.cc
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index 10df6034b8f73043176983f79545127b40f69598..4fa44e528bac7091db2c6902689cc523c968dbb7 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -92,7 +92,7 @@ WebMouseEvent WebMouseEventFromGestureEvent(const WebGestureEvent& gesture) {
mouse.timeStampSeconds = gesture.timeStampSeconds;
mouse.modifiers = gesture.modifiers | WebInputEvent::LeftButtonDown;
- mouse.button = WebMouseEvent::ButtonLeft;
+ mouse.button = WebMouseEvent::Button::Left;
mouse.clickCount = (mouse.type == WebInputEvent::MouseDown ||
mouse.type == WebInputEvent::MouseUp);
@@ -185,7 +185,7 @@ class PepperWidget : public WebWidget {
result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
mouse.type = WebInputEvent::MouseDown;
- mouse.button = WebMouseEvent::ButtonLeft;
+ mouse.button = WebMouseEvent::Button::Left;
mouse.clickCount = gesture_event->data.tap.tapCount;
result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
@@ -219,17 +219,17 @@ class PepperWidget : public WebWidget {
#if defined(OS_WIN)
send_context_menu_event =
mouse_event.type == WebInputEvent::MouseUp &&
- mouse_event.button == WebMouseEvent::ButtonRight;
+ mouse_event.button == WebMouseEvent::Button::Right;
#elif defined(OS_MACOSX)
send_context_menu_event =
mouse_event.type == WebInputEvent::MouseDown &&
- (mouse_event.button == WebMouseEvent::ButtonRight ||
- (mouse_event.button == WebMouseEvent::ButtonLeft &&
+ (mouse_event.button == WebMouseEvent::Button::Right ||
+ (mouse_event.button == WebMouseEvent::Button::Left &&
mouse_event.modifiers & WebMouseEvent::ControlKey));
#else
send_context_menu_event =
mouse_event.type == WebInputEvent::MouseDown &&
- mouse_event.button == WebMouseEvent::ButtonRight;
+ mouse_event.button == WebMouseEvent::Button::Right;
#endif
if (send_context_menu_event) {
WebMouseEvent context_menu_event(mouse_event);
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/webscrollbarbehavior_impl_gtkoraura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698