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/browser/browser_main.cc | |
| 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/browser/browser_main.cc')
| -rw-r--r-- | content/browser/browser_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index c358f49..1127117 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -11,8 +11,8 @@ #include "base/metrics/histogram.h" #include "content/browser/browser_main_loop.h" #include "content/browser/notification_service_impl.h" -#include "content/common/main_function_params.h" #include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" @@ -33,7 +33,7 @@ bool ExitedMainMessageLoop() { } // namespace content // Main routine for running as the Browser process. -int BrowserMain(const MainFunctionParams& parameters) { +int BrowserMain(const content::MainFunctionParams& parameters) { TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, ""); NotificationServiceImpl main_notification_service; |