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

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

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 #include "content/public/common/sandboxed_process_launcher_delegate.h" 132 #include "content/public/common/sandboxed_process_launcher_delegate.h"
133 #include "content/public/common/url_constants.h" 133 #include "content/public/common/url_constants.h"
134 #include "gpu/command_buffer/service/gpu_switches.h" 134 #include "gpu/command_buffer/service/gpu_switches.h"
135 #include "ipc/ipc_channel.h" 135 #include "ipc/ipc_channel.h"
136 #include "ipc/ipc_logging.h" 136 #include "ipc/ipc_logging.h"
137 #include "ipc/ipc_switches.h" 137 #include "ipc/ipc_switches.h"
138 #include "ipc/mojo/ipc_channel_mojo.h" 138 #include "ipc/mojo/ipc_channel_mojo.h"
139 #include "media/base/media_switches.h" 139 #include "media/base/media_switches.h"
140 #include "net/url_request/url_request_context_getter.h" 140 #include "net/url_request/url_request_context_getter.h"
141 #include "ppapi/shared_impl/ppapi_switches.h" 141 #include "ppapi/shared_impl/ppapi_switches.h"
142 #include "storage/browser/fileapi/sandbox_file_system_backend.h"
142 #include "third_party/skia/include/core/SkBitmap.h" 143 #include "third_party/skia/include/core/SkBitmap.h"
143 #include "ui/base/ui_base_switches.h" 144 #include "ui/base/ui_base_switches.h"
144 #include "ui/events/event_switches.h" 145 #include "ui/events/event_switches.h"
145 #include "ui/gfx/switches.h" 146 #include "ui/gfx/switches.h"
146 #include "ui/gl/gl_switches.h" 147 #include "ui/gl/gl_switches.h"
147 #include "ui/native_theme/native_theme_switches.h" 148 #include "ui/native_theme/native_theme_switches.h"
148 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
149 149
150 #if defined(OS_ANDROID) 150 #if defined(OS_ANDROID)
151 #include "content/browser/media/android/browser_demuxer_android.h" 151 #include "content/browser/media/android/browser_demuxer_android.h"
152 #include "content/browser/screen_orientation/screen_orientation_message_filter_a ndroid.h" 152 #include "content/browser/screen_orientation/screen_orientation_message_filter_a ndroid.h"
153 #endif 153 #endif
154 154
155 #if defined(OS_WIN) 155 #if defined(OS_WIN)
156 #include "base/win/scoped_com_initializer.h" 156 #include "base/win/scoped_com_initializer.h"
157 #include "content/common/font_cache_dispatcher_win.h" 157 #include "content/common/font_cache_dispatcher_win.h"
158 #include "content/common/sandbox_win.h" 158 #include "content/common/sandbox_win.h"
(...skipping 2066 matching lines...) Expand 10 before | Expand all | Expand 10 after
2225 if (worker_ref_count_ == 0) 2225 if (worker_ref_count_ == 0)
2226 Cleanup(); 2226 Cleanup();
2227 } 2227 }
2228 2228
2229 void RenderProcessHostImpl::EnsureMojoActivated() { 2229 void RenderProcessHostImpl::EnsureMojoActivated() {
2230 mojo_activation_required_ = true; 2230 mojo_activation_required_ = true;
2231 MaybeActivateMojo(); 2231 MaybeActivateMojo();
2232 } 2232 }
2233 2233
2234 } // namespace content 2234 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698