diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
commit | 9e49959b0e6e940c39359f5f05f9d5da6032a869 (patch) | |
tree | a1059820b0bf8129bcf571966891ce122453465e /content/browser/browser_main_runner.cc | |
parent | 4a8e0f3d4b33c1b69021575d7b971da7b17340ae (diff) | |
download | chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.zip chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.gz chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.bz2 |
Revert "Support sharing of ContentMain and BrowserMain code with embedded use cases."
This reverts commit r120574. Test failures.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r-- | content/browser/browser_main_runner.cc | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc deleted file mode 100644 index b7aaf74..0000000 --- a/content/browser/browser_main_runner.cc +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/public/browser/browser_main_runner.h" - -#include "base/allocator/allocator_shim.h" -#include "base/base_switches.h" -#include "base/command_line.h" -#include "base/debug/trace_event.h" -#include "base/logging.h" -#include "base/metrics/histogram.h" -#include "content/browser/browser_main_loop.h" -#include "content/browser/notification_service_impl.h" -#include "content/common/child_process.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" -#endif - -bool g_exited_main_message_loop = false; - -namespace { - -class BrowserMainRunnerImpl : public content::BrowserMainRunner { - public: - BrowserMainRunnerImpl() - : is_initialized_(false), - is_shutdown_(false) { - } - - ~BrowserMainRunnerImpl() { - if (is_initialized_ && !is_shutdown_) - Shutdown(); - } - - virtual int Initialize(const content::MainFunctionParams& parameters) - OVERRIDE { - is_initialized_ = true; - - // ChildProcess:: is a misnomer unless you consider context. Use - // of --wait-for-debugger only makes sense when Chrome itself is a - // child process (e.g. when launched by PyAuto). - if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) - ChildProcess::WaitForDebugger("Browser"); - - notification_service_.reset(new NotificationServiceImpl); - - main_loop_.reset(new content::BrowserMainLoop(parameters)); - - main_loop_->Init(); - - main_loop_->EarlyInitialization(); - - // Must happen before we try to use a message loop or display any UI. - main_loop_->InitializeToolkit(); - - main_loop_->MainMessageLoopStart(); - - // WARNING: If we get a WM_ENDSESSION, objects created on the stack here - // are NOT deleted. If you need something to run during WM_ENDSESSION add it - // to browser_shutdown::Shutdown or BrowserProcess::EndSession. - -#if defined(OS_WIN) -#if !defined(NO_TCMALLOC) - // When linking shared libraries, NO_TCMALLOC is defined, and dynamic - // allocator selection is not supported. - - // Make this call before going multithreaded, or spawning any subprocesses. - base::allocator::SetupSubprocessAllocator(); -#endif - - com_initializer_.reset(new base::win::ScopedCOMInitializer); -#endif // OS_WIN - - statistics_.reset(new base::StatisticsRecorder); - - main_loop_->CreateThreads(); - - // Return -1 to indicate no early termination. - return -1; - } - - virtual int Run() OVERRIDE { - DCHECK(is_initialized_); - DCHECK(!is_shutdown_); - main_loop_->RunMainMessageLoopParts(); - return main_loop_->GetResultCode(); - } - - virtual void Shutdown() OVERRIDE { - DCHECK(is_initialized_); - DCHECK(!is_shutdown_); - g_exited_main_message_loop = true; - main_loop_->ShutdownThreadsAndCleanUp(); - - statistics_.reset(NULL); - -#if defined(OS_WIN) - com_initializer_.reset(NULL); -#endif - - main_loop_.reset(NULL); - - notification_service_.reset(NULL); - - is_shutdown_ = true; - } - - protected: - // True if the runner has been initialized. - bool is_initialized_; - - // True if the runner has been shut down. - bool is_shutdown_; - - scoped_ptr<NotificationServiceImpl> notification_service_; - scoped_ptr<content::BrowserMainLoop> main_loop_; -#if defined(OS_WIN) - scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; -#endif - scoped_ptr<base::StatisticsRecorder> statistics_; - - DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); -}; - -} // namespace - -namespace content { - -// static -BrowserMainRunner* BrowserMainRunner::Create() { - return new BrowserMainRunnerImpl(); -} - -} // namespace content |