| Index: content/browser/browser_main_loop.cc
|
| ===================================================================
|
| --- content/browser/browser_main_loop.cc (revision 163632)
|
| +++ content/browser/browser_main_loop.cc (working copy)
|
| @@ -91,8 +91,7 @@
|
| #undef DestroyAll
|
| #endif
|
|
|
| -using content::TraceControllerImpl;
|
| -
|
| +namespace content {
|
| namespace {
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| @@ -185,8 +184,6 @@
|
|
|
| } // namespace
|
|
|
| -namespace content {
|
| -
|
| // The currently-running BrowserMainLoop. There can be one or zero.
|
| BrowserMainLoop* g_current_browser_main_loop = NULL;
|
|
|
| @@ -201,9 +198,9 @@
|
| #if defined(OS_WIN)
|
| // At this point the message loop is still running yet we've shut everything
|
| // down. If any messages are processed we'll likely crash. Exit now.
|
| - ExitProcess(content::RESULT_CODE_NORMAL_EXIT);
|
| + ExitProcess(RESULT_CODE_NORMAL_EXIT);
|
| #elif defined(OS_POSIX) && !defined(OS_MACOSX)
|
| - _exit(content::RESULT_CODE_NORMAL_EXIT);
|
| + _exit(RESULT_CODE_NORMAL_EXIT);
|
| #else
|
| NOTIMPLEMENTED();
|
| #endif
|
| @@ -225,10 +222,10 @@
|
| }
|
| // BrowserMainLoop construction / destruction =============================
|
|
|
| -BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
|
| +BrowserMainLoop::BrowserMainLoop(const MainFunctionParams& parameters)
|
| : parameters_(parameters),
|
| parsed_command_line_(parameters.command_line),
|
| - result_code_(content::RESULT_CODE_NORMAL_EXIT) {
|
| + result_code_(RESULT_CODE_NORMAL_EXIT) {
|
| DCHECK(!g_current_browser_main_loop);
|
| g_current_browser_main_loop = this;
|
| }
|
| @@ -304,7 +301,7 @@
|
| switches::kRendererProcessLimit);
|
| size_t process_limit;
|
| if (base::StringToSizeT(limit_string, &process_limit)) {
|
| - content::RenderProcessHost::SetMaxRendererProcessCount(process_limit);
|
| + RenderProcessHost::SetMaxRendererProcessCount(process_limit);
|
| }
|
| }
|
| #endif // !defined(OS_IOS)
|
| @@ -460,7 +457,7 @@
|
| BrowserThread::IO, FROM_HERE, base::Bind(
|
| base::IgnoreResult(&GpuProcessHost::Get),
|
| GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
|
| - content::CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP));
|
| + CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP));
|
| }
|
| #endif // !defined(OS_IOS)
|
|
|
| @@ -639,7 +636,7 @@
|
| #if !defined(OS_IOS)
|
| HistogramSynchronizer::GetInstance();
|
|
|
| - content::BrowserGpuChannelHostFactory::Initialize();
|
| + BrowserGpuChannelHostFactory::Initialize();
|
| #if defined(USE_AURA)
|
| ImageTransportFactory::Initialize();
|
| #endif
|
|
|