diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
| commit | 4573fbd30d7ed70f959efb69b32ad9547465f0ce (patch) | |
| tree | 958d424cf2dfa7b22aba942c8ebc383a5ba22517 /chrome/app | |
| parent | 5262dc192af688c4f9301753fa7890975303b909 (diff) | |
| download | chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.zip chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.gz chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.bz2 | |
Move content_restriction.h and main_function_params.h to content/public/common, and put them in the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8387039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 8 | ||||
| -rw-r--r-- | chrome/app/chrome_main_delegate.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 93ce114..b2c55a6 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -105,8 +105,8 @@ base::LazyInstance<chrome::ChromeContentUtilityClient> 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 @@ void SetUpProfilingShutdownHandler() { struct MainFunction { const char* name; - int (*function)(const MainFunctionParams&); + int (*function)(const content::MainFunctionParams&); }; } // namespace @@ -657,7 +657,7 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { 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) diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h index 064b561..3e9b72a 100644 --- a/chrome/app/chrome_main_delegate.h +++ b/chrome/app/chrome_main_delegate.h @@ -28,7 +28,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate { virtual void SandboxInitialized(const std::string& process_type) OVERRIDE; virtual int RunProcess( const std::string& process_type, - const MainFunctionParams& main_function_params) OVERRIDE; + const content::MainFunctionParams& main_function_params) OVERRIDE; virtual void ProcessExiting(const std::string& process_type) OVERRIDE; #if defined(OS_MACOSX) |