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

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

Issue 9668031: Implement BrowserPluginPlaceholder. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Possibly fixed merge issue Created 8 years, 9 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
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 switches::kDisableLocalStorage, 671 switches::kDisableLocalStorage,
672 switches::kDisableLogging, 672 switches::kDisableLogging,
673 switches::kDisableSeccompSandbox, 673 switches::kDisableSeccompSandbox,
674 switches::kDisableSessionStorage, 674 switches::kDisableSessionStorage,
675 switches::kDisableSharedWorkers, 675 switches::kDisableSharedWorkers,
676 switches::kDisableSpeechInput, 676 switches::kDisableSpeechInput,
677 switches::kDisableWebAudio, 677 switches::kDisableWebAudio,
678 switches::kDisableWebSockets, 678 switches::kDisableWebSockets,
679 switches::kDomAutomationController, 679 switches::kDomAutomationController,
680 switches::kEnableAccessibilityLogging, 680 switches::kEnableAccessibilityLogging,
681 switches::kEnableBrowserPlugin,
681 switches::kEnableDCHECK, 682 switches::kEnableDCHECK,
682 switches::kEnableFixedLayout, 683 switches::kEnableFixedLayout,
683 switches::kEnableGamepad, 684 switches::kEnableGamepad,
684 switches::kEnableGPUServiceLogging, 685 switches::kEnableGPUServiceLogging,
685 switches::kEnableGPUClientLogging, 686 switches::kEnableGPUClientLogging,
686 switches::kEnableLogging, 687 switches::kEnableLogging,
687 switches::kEnableMediaSource, 688 switches::kEnableMediaSource,
688 switches::kEnableMediaStream, 689 switches::kEnableMediaStream,
689 switches::kEnableShadowDOM, 690 switches::kEnableShadowDOM,
690 switches::kEnableStrictSiteIsolation, 691 switches::kEnableStrictSiteIsolation,
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { 1332 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) {
1332 // Only honor the request if appropriate persmissions are granted. 1333 // Only honor the request if appropriate persmissions are granted.
1333 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(), 1334 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(),
1334 path)) 1335 path))
1335 content::GetContentClient()->browser()->OpenItem(path); 1336 content::GetContentClient()->browser()->OpenItem(path);
1336 } 1337 }
1337 1338
1338 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { 1339 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
1339 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size); 1340 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size);
1340 } 1341 }
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698