OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | |
jam
2012/02/08 18:51:12
nit: why remove this? i think this is right per th
ananta
2012/02/08 19:36:41
This file made it through by mistake.
| |
12 #include "base/bind.h" | 11 #include "base/bind.h" |
13 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
14 #include "base/command_line.h" | 13 #include "base/command_line.h" |
15 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
16 #include "base/json/json_value_serializer.h" | 15 #include "base/json/json_value_serializer.h" |
17 #include "base/json/json_writer.h" | 16 #include "base/json/json_writer.h" |
18 #include "base/lazy_instance.h" | 17 #include "base/lazy_instance.h" |
19 #include "base/metrics/histogram.h" | 18 #include "base/metrics/histogram.h" |
20 #include "base/path_service.h" | 19 #include "base/path_service.h" |
21 #include "base/process_util.h" | 20 #include "base/process_util.h" |
(...skipping 4970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4992 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4991 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
4993 return !!RenderThreadImpl::current()->compositor_thread(); | 4992 return !!RenderThreadImpl::current()->compositor_thread(); |
4994 } | 4993 } |
4995 | 4994 |
4996 void RenderViewImpl::OnJavaBridgeInit() { | 4995 void RenderViewImpl::OnJavaBridgeInit() { |
4997 DCHECK(!java_bridge_dispatcher_.get()); | 4996 DCHECK(!java_bridge_dispatcher_.get()); |
4998 #if defined(ENABLE_JAVA_BRIDGE) | 4997 #if defined(ENABLE_JAVA_BRIDGE) |
4999 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 4998 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5000 #endif | 4999 #endif |
5001 } | 5000 } |
OLD | NEW |