Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #include "content/public/browser/render_process_host_observer.h" 124 #include "content/public/browser/render_process_host_observer.h"
125 #include "content/public/browser/render_widget_host.h" 125 #include "content/public/browser/render_widget_host.h"
126 #include "content/public/browser/render_widget_host_iterator.h" 126 #include "content/public/browser/render_widget_host_iterator.h"
127 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" 127 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
128 #include "content/public/browser/resource_context.h" 128 #include "content/public/browser/resource_context.h"
129 #include "content/public/browser/user_metrics.h" 129 #include "content/public/browser/user_metrics.h"
130 #include "content/public/browser/worker_service.h" 130 #include "content/public/browser/worker_service.h"
131 #include "content/public/common/content_constants.h" 131 #include "content/public/common/content_constants.h"
132 #include "content/public/common/content_switches.h" 132 #include "content/public/common/content_switches.h"
133 #include "content/public/common/process_type.h" 133 #include "content/public/common/process_type.h"
134 #include "content/public/common/resource_type.h"
134 #include "content/public/common/result_codes.h" 135 #include "content/public/common/result_codes.h"
135 #include "content/public/common/sandboxed_process_launcher_delegate.h" 136 #include "content/public/common/sandboxed_process_launcher_delegate.h"
136 #include "content/public/common/url_constants.h" 137 #include "content/public/common/url_constants.h"
137 #include "gpu/command_buffer/service/gpu_switches.h" 138 #include "gpu/command_buffer/service/gpu_switches.h"
138 #include "ipc/ipc_channel.h" 139 #include "ipc/ipc_channel.h"
139 #include "ipc/ipc_logging.h" 140 #include "ipc/ipc_logging.h"
140 #include "ipc/ipc_switches.h" 141 #include "ipc/ipc_switches.h"
141 #include "media/base/media_switches.h" 142 #include "media/base/media_switches.h"
142 #include "net/url_request/url_request_context_getter.h" 143 #include "net/url_request/url_request_context_getter.h"
143 #include "ppapi/shared_impl/ppapi_switches.h" 144 #include "ppapi/shared_impl/ppapi_switches.h"
144 #include "third_party/skia/include/core/SkBitmap.h" 145 #include "third_party/skia/include/core/SkBitmap.h"
145 #include "ui/base/ui_base_switches.h" 146 #include "ui/base/ui_base_switches.h"
146 #include "ui/events/event_switches.h" 147 #include "ui/events/event_switches.h"
147 #include "ui/gfx/switches.h" 148 #include "ui/gfx/switches.h"
148 #include "ui/gl/gl_switches.h" 149 #include "ui/gl/gl_switches.h"
149 #include "ui/native_theme/native_theme_switches.h" 150 #include "ui/native_theme/native_theme_switches.h"
150 #include "webkit/browser/fileapi/sandbox_file_system_backend.h" 151 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
151 #include "webkit/common/resource_type.h"
152 152
153 #if defined(OS_ANDROID) 153 #if defined(OS_ANDROID)
154 #include "content/browser/media/android/browser_demuxer_android.h" 154 #include "content/browser/media/android/browser_demuxer_android.h"
155 #include "content/browser/renderer_host/compositor_impl_android.h" 155 #include "content/browser/renderer_host/compositor_impl_android.h"
156 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h" 156 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
157 #endif 157 #endif
158 158
159 #if defined(OS_MACOSX) 159 #if defined(OS_MACOSX)
160 #include "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h" 160 #include "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h"
161 #endif 161 #endif
(...skipping 2198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 void RenderProcessHostImpl::GpuMemoryBufferAllocated( 2360 void RenderProcessHostImpl::GpuMemoryBufferAllocated(
2361 IPC::Message* reply, 2361 IPC::Message* reply,
2362 const gfx::GpuMemoryBufferHandle& handle) { 2362 const gfx::GpuMemoryBufferHandle& handle) {
2363 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2363 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2364 ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer::WriteReplyParams(reply, 2364 ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer::WriteReplyParams(reply,
2365 handle); 2365 handle);
2366 Send(reply); 2366 Send(reply);
2367 } 2367 }
2368 2368
2369 } // namespace content 2369 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698