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

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

Issue 11615002: Exclude PluginService for builds with enable_plugins==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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 | « content/browser/renderer_host/render_message_filter.cc ('k') | content/content_browser.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 #include <algorithm> 10 #include <algorithm>
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 scoped_refptr<BrowserPluginMessageFilter> bp_message_filter( 487 scoped_refptr<BrowserPluginMessageFilter> bp_message_filter(
488 new BrowserPluginMessageFilter( 488 new BrowserPluginMessageFilter(
489 GetID(), 489 GetID(),
490 GetBrowserContext())); 490 GetBrowserContext()));
491 channel_->AddFilter(bp_message_filter); 491 channel_->AddFilter(bp_message_filter);
492 } 492 }
493 493
494 scoped_refptr<RenderMessageFilter> render_message_filter( 494 scoped_refptr<RenderMessageFilter> render_message_filter(
495 new RenderMessageFilter( 495 new RenderMessageFilter(
496 GetID(), 496 GetID(),
497 #if defined(ENABLE_PLUGINS)
497 PluginServiceImpl::GetInstance(), 498 PluginServiceImpl::GetInstance(),
499 #else
500 NULL,
501 #endif
498 GetBrowserContext(), 502 GetBrowserContext(),
499 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), 503 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()),
500 widget_helper_, 504 widget_helper_,
501 media_observer, 505 media_observer,
502 storage_partition_impl_->GetDOMStorageContext())); 506 storage_partition_impl_->GetDOMStorageContext()));
503 channel_->AddFilter(render_message_filter); 507 channel_->AddFilter(render_message_filter);
504 BrowserContext* browser_context = GetBrowserContext(); 508 BrowserContext* browser_context = GetBrowserContext();
505 ResourceContext* resource_context = browser_context->GetResourceContext(); 509 ResourceContext* resource_context = browser_context->GetResourceContext();
506 510
507 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( 511 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 switches::kDisableMediaSource, 775 switches::kDisableMediaSource,
772 switches::kDisableWebMediaPlayerMS, 776 switches::kDisableWebMediaPlayerMS,
773 #if defined(OS_WIN) || defined(OS_MACOSX) 777 #if defined(OS_WIN) || defined(OS_MACOSX)
774 switches::kDisableRendererSideMixing, 778 switches::kDisableRendererSideMixing,
775 #else 779 #else
776 switches::kEnableRendererSideMixing, 780 switches::kEnableRendererSideMixing,
777 #endif 781 #endif
778 switches::kEnableStrictSiteIsolation, 782 switches::kEnableStrictSiteIsolation,
779 switches::kDisableFullScreen, 783 switches::kDisableFullScreen,
780 switches::kEnableNewDialogStyle, 784 switches::kEnableNewDialogStyle,
785 #if defined(ENABLE_PLUGINS)
781 switches::kEnablePepperTesting, 786 switches::kEnablePepperTesting,
787 #endif
782 switches::kEnablePreparsedJsCaching, 788 switches::kEnablePreparsedJsCaching,
783 switches::kEnablePruneGpuCommandBuffers, 789 switches::kEnablePruneGpuCommandBuffers,
784 switches::kEnablePinch, 790 switches::kEnablePinch,
785 #if defined(OS_MACOSX) 791 #if defined(OS_MACOSX)
786 // Allow this to be set when invoking the browser and relayed along. 792 // Allow this to be set when invoking the browser and relayed along.
787 switches::kEnableSandboxLogging, 793 switches::kEnableSandboxLogging,
788 #endif 794 #endif
789 switches::kEnableSeccompSandbox, 795 switches::kEnableSeccompSandbox,
790 switches::kEnableSoftwareCompositingGLAdapter, 796 switches::kEnableSoftwareCompositingGLAdapter,
791 switches::kEnableStatsTable, 797 switches::kEnableStatsTable,
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1600 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1595 AcceleratedSurfaceMsg_BufferPresented_Params ack_params; 1601 AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
1596 ack_params.surface_handle = surface_handle; 1602 ack_params.surface_handle = surface_handle;
1597 ack_params.sync_point = 0; 1603 ack_params.sync_point = 0;
1598 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1604 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1599 gpu_process_host_id, 1605 gpu_process_host_id,
1600 ack_params); 1606 ack_params);
1601 } 1607 }
1602 1608
1603 } // namespace content 1609 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698