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

Unified Diff: content/browser/renderer_host/input/legacy_input_router_impl.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Rebased again Created 3 years, 5 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
Index: content/browser/renderer_host/input/legacy_input_router_impl.cc
diff --git a/content/browser/renderer_host/input/legacy_input_router_impl.cc b/content/browser/renderer_host/input/legacy_input_router_impl.cc
index 98df9a474cd229c9b6532ee5491a3818efdd6b6c..fd6b4cfd94e6a15502dfe3b1ea1c0bd437b4ed98 100644
--- a/content/browser/renderer_host/input/legacy_input_router_impl.cc
+++ b/content/browser/renderer_host/input/legacy_input_router_impl.cc
@@ -36,7 +36,7 @@
#include "ui/events/event.h"
#include "ui/events/keycodes/keyboard_codes.h"
-using base::Time;
+//using base::Time; // Collides with X11 Time typedef and is not used
using base::TimeDelta;
using base::TimeTicks;
using blink::WebGestureEvent;
« no previous file with comments | « content/browser/net/network_errors_listing_ui.cc ('k') | content/browser/renderer_host/input/legacy_touch_event_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698