diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:47:58 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:47:58 +0000 |
| commit | 0ff0d178c2efc81ad1fde5bd7c3886948d99b17e (patch) | |
| tree | 9d9b7864e7dc3dd6a13fd96544cc47036dca1ec7 /chrome/browser/chrome_browser_main_linux.cc | |
| parent | 5946d4855a4122d38e706d8463d7eae2448549f9 (diff) | |
| download | chromium_src-0ff0d178c2efc81ad1fde5bd7c3886948d99b17e.zip chromium_src-0ff0d178c2efc81ad1fde5bd7c3886948d99b17e.tar.gz chromium_src-0ff0d178c2efc81ad1fde5bd7c3886948d99b17e.tar.bz2 | |
Only initialize DBusThreadManager exactly once.
Also only shutdown initialized services in ChromeBrowserMainParts to reduce warning spam.
BUG=159854
For chrome/browser:
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11332005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_linux.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index 04a5f88..e764919 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -81,11 +81,13 @@ bool IsCrashReportingEnabled(const PrefService* local_state) { ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( const content::MainFunctionParams& parameters) - : ChromeBrowserMainPartsPosix(parameters) { + : ChromeBrowserMainPartsPosix(parameters), + did_pre_profile_init_(false) { } ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() { - chrome::MediaTransferProtocolManager::Shutdown(); + if (did_pre_profile_init_) + chrome::MediaTransferProtocolManager::Shutdown(); } void ChromeBrowserMainPartsLinux::PreProfileInit() { @@ -115,6 +117,8 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { chrome::MediaTransferProtocolManager::Initialize(); + did_pre_profile_init_ = true; + ChromeBrowserMainPartsPosix::PreProfileInit(); } |