chrome/app/chrome_main_delegate.cc - Issue 8387039: Move content_restriction.h and main_function_params.h to content/public/common, and put them in t...

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: chrome/app/chrome_main_delegate.cc

Issue 8387039: Move content_restriction.h and main_function_params.h to content/public/common, and put them in t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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: chrome/app/chrome_main_delegate.cc

===================================================================

--- chrome/app/chrome_main_delegate.cc (revision 107906)

+++ chrome/app/chrome_main_delegate.cc (working copy)

@@ -105,8 +105,8 @@

base::LazyInstance<chrome::ChromeContentPluginClient>

g_chrome_content_plugin_client(base::LINKER_INITIALIZED);

-extern int NaClMain(const MainFunctionParams&);

-extern int ServiceProcessMain(const MainFunctionParams&);

+extern int NaClMain(const content::MainFunctionParams&);

+extern int ServiceProcessMain(const content::MainFunctionParams&);

namespace {

@@ -374,7 +374,7 @@

struct MainFunction {

const char* name;

- int (*function)(const MainFunctionParams&);

+ int (*function)(const content::MainFunctionParams&);

};

} // namespace

@@ -657,7 +657,7 @@

int ChromeMainDelegate::RunProcess(

const std::string& process_type,

- const MainFunctionParams& main_function_params) {

+ const content::MainFunctionParams& main_function_params) {

static const MainFunction kMainFunctions[] = {

{ switches::kServiceProcess, ServiceProcessMain },

#if defined(OS_MACOSX)

« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »