Snapshot of all changes to get jumbo in blink and content.

content/browser/renderer_host/input/legacy_input_router_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/legacy_input_router_impl.h"
 
 #include <math.h>
 
 #include <utility>
 
@@ skipping 18 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_sender.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #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;
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
 using ui::WebInputEventTraits;
 
@@ skipping 615 matching lines @@
                global_touch_position_.end());
         global_touch_position_[touch_point->id] =
             gfx::Point(touch_point->PositionInScreen().x,
                        touch_point->PositionInScreen().y);
       }
     }
   }
 }
 
 }  // namespace content