Index: content/browser/browser_main_runner.cc |
=================================================================== |
--- content/browser/browser_main_runner.cc (revision 164795) |
+++ content/browser/browser_main_runner.cc (working copy) |
@@ -29,12 +29,9 @@ |
bool g_exited_main_message_loop = false; |
-using content::ChildProcess; |
-using content::NotificationServiceImpl; |
+namespace content { |
-namespace { |
- |
-class BrowserMainRunnerImpl : public content::BrowserMainRunner { |
+class BrowserMainRunnerImpl : public BrowserMainRunner { |
public: |
BrowserMainRunnerImpl() |
: is_initialized_(false), |
@@ -47,7 +44,7 @@ |
Shutdown(); |
} |
- virtual int Initialize(const content::MainFunctionParams& parameters) |
+ virtual int Initialize(const MainFunctionParams& parameters) |
OVERRIDE { |
is_initialized_ = true; |
@@ -70,7 +67,7 @@ |
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 @@ |
#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 @@ |
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 @@ |
DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); |
}; |
-} // namespace |
- |
-namespace content { |
- |
// static |
BrowserMainRunner* BrowserMainRunner::Create() { |
return new BrowserMainRunnerImpl(); |