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 /content/plugin | |
| 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 'content/plugin')
| -rw-r--r-- | content/plugin/plugin_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 8a5d0ff..8e8b1ea 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -16,9 +16,9 @@ #include "base/threading/platform_thread.h" #include "content/common/child_process.h" #include "content/common/hi_res_timer_manager.h" -#include "content/common/main_function_params.h" #include "content/plugin/plugin_thread.h" #include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" #if defined(OS_WIN) #include "content/common/injection_test_dll.h" @@ -75,7 +75,7 @@ int PreloadIMEForFlash() { #endif // main() routine for running as the plugin process. -int PluginMain(const MainFunctionParams& parameters) { +int PluginMain(const content::MainFunctionParams& parameters) { // The main thread of the plugin services UI. #if defined(OS_MACOSX) #if !defined(__LP64__) |