Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 | 11 |
| 12 #include "base/bind.h" | |
| 13 #include "base/bind_helpers.h" | |
|
csilv
2011/11/14 19:56:51
I don't see a use for bind or bind_helpers, can yo
James Hawkins
2011/11/14 21:50:50
Used them, didn't use them, forgot to take them ou
| |
| 12 #include "base/callback.h" | 14 #include "base/callback.h" |
| 15 #include "base/callback_old.h" | |
| 13 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 14 #include "base/compiler_specific.h" | 17 #include "base/compiler_specific.h" |
| 15 #include "base/json/json_value_serializer.h" | 18 #include "base/json/json_value_serializer.h" |
| 16 #include "base/json/json_writer.h" | 19 #include "base/json/json_writer.h" |
| 17 #include "base/lazy_instance.h" | 20 #include "base/lazy_instance.h" |
| 18 #include "base/metrics/histogram.h" | 21 #include "base/metrics/histogram.h" |
| 19 #include "base/path_service.h" | 22 #include "base/path_service.h" |
| 20 #include "base/process_util.h" | 23 #include "base/process_util.h" |
| 21 #include "base/string_piece.h" | 24 #include "base/string_piece.h" |
| 22 #include "base/string_split.h" | 25 #include "base/string_split.h" |
| (...skipping 4681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4704 return webview()->settings()->useThreadedCompositor(); | 4707 return webview()->settings()->useThreadedCompositor(); |
| 4705 } | 4708 } |
| 4706 | 4709 |
| 4707 void RenderViewImpl::OnJavaBridgeInit( | 4710 void RenderViewImpl::OnJavaBridgeInit( |
| 4708 const IPC::ChannelHandle& channel_handle) { | 4711 const IPC::ChannelHandle& channel_handle) { |
| 4709 DCHECK(!java_bridge_dispatcher_.get()); | 4712 DCHECK(!java_bridge_dispatcher_.get()); |
| 4710 #if defined(ENABLE_JAVA_BRIDGE) | 4713 #if defined(ENABLE_JAVA_BRIDGE) |
| 4711 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4714 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4712 #endif | 4715 #endif |
| 4713 } | 4716 } |
| OLD | NEW |