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

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 #include <utility>
@@ skipping 237 matching lines @@
 using blink::WebURL;
 using blink::WebURLError;
 using blink::WebURLRequest;
 using blink::WebURLResponse;
 using blink::WebUserGestureIndicator;
 using blink::WebVector;
 using blink::WebView;
 using blink::WebWidget;
 using blink::WebWindowFeatures;
 using blink::WebRuntimeFeatures;
-using base::Time;
+//using base::Time; // Colliding with X11 Time typedef and is not used
 using base::TimeDelta;
 
 
 namespace content {
 
 //-----------------------------------------------------------------------------
 
 typedef std::map<blink::WebView*, RenderViewImpl*> ViewMap;
 static base::LazyInstance<ViewMap>::Leaky g_view_map =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 2257 matching lines @@
     std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info,
                             nullptr, base::nullopt);
     return;
   }
   idle_user_detector_->ActivityDetected();
   RenderWidget::HandleInputEvent(input_event, latency_info,
                                  std::move(callback));
 }
 
 }  // namespace content