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 // 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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 DCHECK(gpu_data_manager); | 639 DCHECK(gpu_data_manager); |
640 gpu_data_manager->AppendRendererCommandLine(command_line); | 640 gpu_data_manager->AppendRendererCommandLine(command_line); |
641 } | 641 } |
642 | 642 |
643 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( | 643 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
644 const CommandLine& browser_cmd, | 644 const CommandLine& browser_cmd, |
645 CommandLine* renderer_cmd) const { | 645 CommandLine* renderer_cmd) const { |
646 // Propagate the following switches to the renderer command line (along | 646 // Propagate the following switches to the renderer command line (along |
647 // with any associated values) if present in the browser command line. | 647 // with any associated values) if present in the browser command line. |
648 static const char* const kSwitchNames[] = { | 648 static const char* const kSwitchNames[] = { |
| 649 switches::kAllowNaClSocketAPI, |
649 // We propagate the Chrome Frame command line here as well in case the | 650 // We propagate the Chrome Frame command line here as well in case the |
650 // renderer is not run in the sandbox. | 651 // renderer is not run in the sandbox. |
651 switches::kAuditAllHandles, | 652 switches::kAuditAllHandles, |
652 switches::kAuditHandles, | 653 switches::kAuditHandles, |
653 switches::kChromeFrame, | 654 switches::kChromeFrame, |
654 switches::kDisable3DAPIs, | 655 switches::kDisable3DAPIs, |
655 switches::kDisableAcceleratedCompositing, | 656 switches::kDisableAcceleratedCompositing, |
656 switches::kDisableApplicationCache, | 657 switches::kDisableApplicationCache, |
657 switches::kDisableAudio, | 658 switches::kDisableAudio, |
658 switches::kDisableBreakpad, | 659 switches::kDisableBreakpad, |
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1311 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { | 1312 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { |
1312 // Only honor the request if appropriate persmissions are granted. | 1313 // Only honor the request if appropriate persmissions are granted. |
1313 if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(GetID(), path)) | 1314 if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(GetID(), path)) |
1314 content::GetContentClient()->browser()->OpenItem(path); | 1315 content::GetContentClient()->browser()->OpenItem(path); |
1315 } | 1316 } |
1316 | 1317 |
1317 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { | 1318 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { |
1318 content::GetContentClient()->browser()->GetMHTMLGenerationManager()-> | 1319 content::GetContentClient()->browser()->GetMHTMLGenerationManager()-> |
1319 MHTMLGenerated(job_id, data_size); | 1320 MHTMLGenerated(job_id, data_size); |
1320 } | 1321 } |
OLD | NEW |