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 // 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 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1208 // finished. | 1208 // finished. |
1209 renderer_cmd->AppendSwitchASCII( | 1209 renderer_cmd->AppendSwitchASCII( |
1210 switches::kTraceStartup, | 1210 switches::kTraceStartup, |
1211 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup)); | 1211 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup)); |
1212 } | 1212 } |
1213 | 1213 |
1214 // Disable databases in incognito mode. | 1214 // Disable databases in incognito mode. |
1215 if (GetBrowserContext()->IsOffTheRecord() && | 1215 if (GetBrowserContext()->IsOffTheRecord() && |
1216 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { | 1216 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { |
1217 renderer_cmd->AppendSwitch(switches::kDisableDatabases); | 1217 renderer_cmd->AppendSwitch(switches::kDisableDatabases); |
1218 #if defined(OS_ANDROID) | |
1219 renderer_cmd->AppendSwitch(switches::kDisableMediaHistoryLogging); | |
1220 #endif | |
1221 } | 1218 } |
1222 | 1219 |
1223 // Enforce the extra command line flags for impl-side painting. | 1220 // Enforce the extra command line flags for impl-side painting. |
1224 if (IsImplSidePaintingEnabled() && | 1221 if (IsImplSidePaintingEnabled() && |
1225 !browser_cmd.HasSwitch(switches::kEnableDeferredImageDecoding)) | 1222 !browser_cmd.HasSwitch(switches::kEnableDeferredImageDecoding)) |
1226 renderer_cmd->AppendSwitch(switches::kEnableDeferredImageDecoding); | 1223 renderer_cmd->AppendSwitch(switches::kEnableDeferredImageDecoding); |
1227 } | 1224 } |
1228 | 1225 |
1229 base::ProcessHandle RenderProcessHostImpl::GetHandle() const { | 1226 base::ProcessHandle RenderProcessHostImpl::GetHandle() const { |
1230 if (run_renderer_in_process()) | 1227 if (run_renderer_in_process()) |
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2075 mojo::ScopedMessagePipeHandle handle) { | 2072 mojo::ScopedMessagePipeHandle handle) { |
2076 mojo_activation_required_ = true; | 2073 mojo_activation_required_ = true; |
2077 MaybeActivateMojo(); | 2074 MaybeActivateMojo(); |
2078 | 2075 |
2079 mojo::AllocationScope scope; | 2076 mojo::AllocationScope scope; |
2080 mojo_application_host_->shell_client()->AcceptConnection(service_name, | 2077 mojo_application_host_->shell_client()->AcceptConnection(service_name, |
2081 handle.Pass()); | 2078 handle.Pass()); |
2082 } | 2079 } |
2083 | 2080 |
2084 } // namespace content | 2081 } // namespace content |
OLD | NEW |