content/renderer/renderer_main.cc - Issue 10868012: Browser Plugin: New Implementation (Browser Side)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/renderer_main.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser

Patch Set: @tott + Address comments + fix win_rel trybot flakiness Created 8 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 side-by-side diff with in-line comments

Download patch

« content/browser/browser_plugin/test_timeout_tracker.h ('K') | « content/renderer/browser_plugin/browser_plugin_manager_impl.cc ('k') | content/test/data/browser_plugin_embedder.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/renderer_main.cc

diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc

index e827686abd877ef9d86c3517eaaba667f62192f2..12793a598c9e664870ac331cd0a84b2512a97feb 100644

--- a/content/renderer/renderer_main.cc

+++ b/content/renderer/renderer_main.cc

@@ -24,6 +24,7 @@

#include "content/public/common/content_switches.h"

#include "content/public/common/main_function_params.h"

#include "content/public/renderer/content_renderer_client.h"

+#include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"

#include "content/renderer/render_process_impl.h"

#include "content/renderer/render_thread_impl.h"

#include "content/renderer/renderer_main_platform_delegate.h"

@@ -217,6 +218,7 @@ int RendererMain(const content::MainFunctionParams& parameters) {

RenderProcessImpl render_process;

new RenderThreadImpl();

#endif

+ new content::BrowserPluginManagerImpl();

platform.RunSandboxTests();