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_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" | 102 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" |
103 #include "third_party/WebKit/public/web/WebPopupMenu.h" | 103 #include "third_party/WebKit/public/web/WebPopupMenu.h" |
104 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 104 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
105 #include "third_party/WebKit/public/web/WebScriptController.h" | 105 #include "third_party/WebKit/public/web/WebScriptController.h" |
106 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 106 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
107 #include "third_party/WebKit/public/web/WebView.h" | 107 #include "third_party/WebKit/public/web/WebView.h" |
108 #include "ui/base/layout.h" | 108 #include "ui/base/layout.h" |
109 #include "ui/base/ui_base_switches.h" | 109 #include "ui/base/ui_base_switches.h" |
110 #include "v8/include/v8.h" | 110 #include "v8/include/v8.h" |
111 #include "webkit/child/worker_task_runner.h" | 111 #include "webkit/child/worker_task_runner.h" |
112 #include "webkit/glue/webkit_glue.h" | |
113 #include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h" | 112 #include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h" |
114 | 113 |
115 #if defined(OS_WIN) | 114 #if defined(OS_WIN) |
116 #include <windows.h> | 115 #include <windows.h> |
117 #include <objbase.h> | 116 #include <objbase.h> |
118 #include "base/win/scoped_com_initializer.h" | 117 #include "base/win/scoped_com_initializer.h" |
119 #else | 118 #else |
120 // TODO(port) | 119 // TODO(port) |
121 #include "base/memory/scoped_handle.h" | 120 #include "base/memory/scoped_handle.h" |
122 #include "content/child/npapi/np_channel_base.h" | 121 #include "content/child/npapi/np_channel_base.h" |
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1370 if (!gamepad_shared_memory_reader_) | 1369 if (!gamepad_shared_memory_reader_) |
1371 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); | 1370 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); |
1372 gamepad_shared_memory_reader_->SampleGamepads(*data); | 1371 gamepad_shared_memory_reader_->SampleGamepads(*data); |
1373 } | 1372 } |
1374 | 1373 |
1375 base::ProcessId RenderThreadImpl::renderer_process_id() const { | 1374 base::ProcessId RenderThreadImpl::renderer_process_id() const { |
1376 return renderer_process_id_; | 1375 return renderer_process_id_; |
1377 } | 1376 } |
1378 | 1377 |
1379 } // namespace content | 1378 } // namespace content |
OLD | NEW |