| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 853d6f3e1252229c29e46bbad90188a4e6d58429..7587154fc0d580330472ee19121d7bb6b436fa94 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -255,7 +255,7 @@ 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;
|
|
|
|
|
|
|