content/ppapi_plugin/ppapi_plugin_main.cc - Issue 1848523002: Changes to support using base/feature_list.h from gin/.

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/ppapi_plugin/ppapi_plugin_main.cc

Issue 1848523002: Changes to support using base/feature_list.h from gin/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 8 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

Index: content/ppapi_plugin/ppapi_plugin_main.cc

diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc

index fccb830e7cbbfdfbbc527e3bbb9ae73fa09a6ae0..71ecf15c6bdb0935ff0066b6c46e537206b66792 100644

--- a/content/ppapi_plugin/ppapi_plugin_main.cc

+++ b/content/ppapi_plugin/ppapi_plugin_main.cc

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

#include "base/command_line.h"

#include "base/debug/crash_logging.h"

#include "base/debug/debugger.h"

+#include "base/feature_list.h"

#include "base/files/file_path.h"

#include "base/i18n/rtl.h"

#include "base/message_loop/message_loop.h"

@@ -131,6 +132,12 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {

LinuxSandbox::InitializeSandbox();

#endif

+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);

+ feature_list->InitializeFromCommandLine(

+ command_line.GetSwitchValueASCII(switches::kEnableFeatures),

+ command_line.GetSwitchValueASCII(switches::kDisableFeatures));

+ base::FeatureList::SetInstance(std::move(feature_list));

ChildProcess ppapi_process;

ppapi_process.set_main_thread(

new PpapiThread(parameters.command_line, false)); // Not a broker.

« no previous file with comments | « base/test/test_suite.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »