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/browser/mac | |
| 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/browser/mac')
| -rw-r--r-- | chrome/browser/mac/relauncher.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/mac/relauncher.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/mac/relauncher.cc b/chrome/browser/mac/relauncher.cc index ee1af48..700f8da 100644 --- a/chrome/browser/mac/relauncher.cc +++ b/chrome/browser/mac/relauncher.cc @@ -28,9 +28,9 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/mac/install_from_dmg.h" #include "chrome/common/chrome_switches.h" -#include "content/common/main_function_params.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" // RTLD_MAIN_ONLY is supported as of Mac OS X 10.5, but <dlfcn.h> does not // define it in the 10.5 SDK. It is present in the 10.6 SDK and is documented @@ -255,7 +255,7 @@ void RelauncherSynchronizeWithParent() { namespace internal { -int RelauncherMain(const MainFunctionParams& main_parameters) { +int RelauncherMain(const content::MainFunctionParams& main_parameters) { // CommandLine rearranges the order of the arguments returned by // main_parameters.argv(), rendering it impossible to determine which // arguments originally came before kRelauncherArgSeparator and which came diff --git a/chrome/browser/mac/relauncher.h b/chrome/browser/mac/relauncher.h index 26ab08b..7ccdd9c 100644 --- a/chrome/browser/mac/relauncher.h +++ b/chrome/browser/mac/relauncher.h @@ -33,7 +33,9 @@ #include <string> #include <vector> +namespace content { struct MainFunctionParams; +} namespace mac_relauncher { @@ -73,7 +75,7 @@ namespace internal { // The entry point from ChromeMain into the relauncher process. This is not a // user API. Don't call it if your name isn't ChromeMain. -int RelauncherMain(const MainFunctionParams& main_parameters); +int RelauncherMain(const content::MainFunctionParams& main_parameters); } // namespace internal |