summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 03:22:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 03:22:20 +0000
commit464883218eccabb97b52f7bcc6a459709b69f87e (patch)
tree20e62a5781a44d6827019d61d075e264e87b0469 /content/browser/browser_main.cc
parent3df72a134583efcc1e86c6abac2103c9800c5c13 (diff)
downloadchromium_src-464883218eccabb97b52f7bcc6a459709b69f87e.zip
chromium_src-464883218eccabb97b52f7bcc6a459709b69f87e.tar.gz
chromium_src-464883218eccabb97b52f7bcc6a459709b69f87e.tar.bz2
Move remaining files in content\browser to the content namespace.
Review URL: https://codereview.chromium.org/11340029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main.cc')
-rw-r--r--content/browser/browser_main.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index 99f8247..8c22dc4 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -7,12 +7,13 @@
#include "base/debug/trace_event.h"
#include "content/public/browser/browser_main_runner.h"
+namespace content {
+
// Main routine for running as the Browser process.
-int BrowserMain(const content::MainFunctionParams& parameters) {
+int BrowserMain(const MainFunctionParams& parameters) {
TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
- scoped_ptr<content::BrowserMainRunner> main_runner_(
- content::BrowserMainRunner::Create());
+ scoped_ptr<BrowserMainRunner> main_runner_(BrowserMainRunner::Create());
int exit_code = main_runner_->Initialize(parameters);
if (exit_code >= 0)
@@ -26,3 +27,5 @@ int BrowserMain(const content::MainFunctionParams& parameters) {
return exit_code;
}
+
+} // namespace content