summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_runner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r--content/browser/browser_main_runner.cc24
1 files changed, 8 insertions, 16 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 319a59f..a58e566 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -29,12 +29,9 @@
bool g_exited_main_message_loop = false;
-using content::ChildProcess;
-using content::NotificationServiceImpl;
-
-namespace {
+namespace content {
-class BrowserMainRunnerImpl : public content::BrowserMainRunner {
+class BrowserMainRunnerImpl : public BrowserMainRunner {
public:
BrowserMainRunnerImpl()
: is_initialized_(false),
@@ -47,7 +44,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
Shutdown();
}
- virtual int Initialize(const content::MainFunctionParams& parameters)
+ virtual int Initialize(const MainFunctionParams& parameters)
OVERRIDE {
is_initialized_ = true;
@@ -70,7 +67,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
notification_service_.reset(new NotificationServiceImpl);
- main_loop_.reset(new content::BrowserMainLoop(parameters));
+ main_loop_.reset(new BrowserMainLoop(parameters));
main_loop_->Init();
@@ -99,10 +96,9 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
#endif // OS_WIN
#if defined(OS_ANDROID)
- content::SurfaceTexturePeer::InitInstance(
- new content::SurfaceTexturePeerBrowserImpl(
- parameters.command_line.HasSwitch(
- switches::kMediaPlayerInRenderProcess)));
+ SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl(
+ parameters.command_line.HasSwitch(
+ switches::kMediaPlayerInRenderProcess)));
#endif
main_loop_->CreateThreads();
@@ -154,7 +150,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
bool created_threads_;
scoped_ptr<NotificationServiceImpl> notification_service_;
- scoped_ptr<content::BrowserMainLoop> main_loop_;
+ scoped_ptr<BrowserMainLoop> main_loop_;
#if defined(OS_WIN)
scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
#endif
@@ -162,10 +158,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
};
-} // namespace
-
-namespace content {
-
// static
BrowserMainRunner* BrowserMainRunner::Create() {
return new BrowserMainRunnerImpl();