OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_browser_main_linux.h" | 5 #include "chrome/browser/chrome_browser_main_linux.h" |
6 | 6 |
7 #include <fontconfig/fontconfig.h> | 7 #include <fontconfig/fontconfig.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 // g_browser_process. This happens in PreCreateThreads. | 49 // g_browser_process. This happens in PreCreateThreads. |
50 // base::GetLinuxDistro() will initialize its value if needed. | 50 // base::GetLinuxDistro() will initialize its value if needed. |
51 content::BrowserThread::PostBlockingPoolTask( | 51 content::BrowserThread::PostBlockingPoolTask( |
52 FROM_HERE, | 52 FROM_HERE, |
53 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); | 53 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); |
54 #endif | 54 #endif |
55 | 55 |
56 media::AudioManager::SetGlobalAppName( | 56 media::AudioManager::SetGlobalAppName( |
57 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); | 57 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); |
58 | 58 |
| 59 #if !defined(OS_CHROMEOS) |
| 60 // Forward to os_crypt the flag to use a specific password store. |
| 61 std::string password_store = |
| 62 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore); |
| 63 OSCrypt::SetStore(password_store); |
| 64 #endif |
| 65 |
59 ChromeBrowserMainPartsPosix::PreProfileInit(); | 66 ChromeBrowserMainPartsPosix::PreProfileInit(); |
60 } | 67 } |
61 | 68 |
62 void ChromeBrowserMainPartsLinux::PostProfileInit() { | 69 void ChromeBrowserMainPartsLinux::PostProfileInit() { |
63 ChromeBrowserMainPartsPosix::PostProfileInit(); | 70 ChromeBrowserMainPartsPosix::PostProfileInit(); |
64 | 71 |
65 g_browser_process->metrics_service()->RecordBreakpadRegistration( | 72 g_browser_process->metrics_service()->RecordBreakpadRegistration( |
66 breakpad::IsCrashReporterEnabled()); | 73 breakpad::IsCrashReporterEnabled()); |
67 | |
68 #if !defined(OS_CHROMEOS) | |
69 // Forward to os_crypt the flag to use a specific password store. | |
70 std::string password_store = | |
71 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore); | |
72 OSCrypt::SetStore(password_store); | |
73 #endif | |
74 } | 74 } |
75 | 75 |
76 void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { | 76 void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { |
77 #if !defined(OS_CHROMEOS) | 77 #if !defined(OS_CHROMEOS) |
78 bluez::DBusThreadManagerLinux::Initialize(); | 78 bluez::DBusThreadManagerLinux::Initialize(); |
79 bluez::BluezDBusManager::Initialize( | 79 bluez::BluezDBusManager::Initialize( |
80 bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); | 80 bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); |
81 #endif | 81 #endif |
82 | 82 |
83 ChromeBrowserMainPartsPosix::PostMainMessageLoopStart(); | 83 ChromeBrowserMainPartsPosix::PostMainMessageLoopStart(); |
84 } | 84 } |
85 | 85 |
86 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { | 86 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { |
87 #if !defined(OS_CHROMEOS) | 87 #if !defined(OS_CHROMEOS) |
88 bluez::BluezDBusManager::Shutdown(); | 88 bluez::BluezDBusManager::Shutdown(); |
89 bluez::DBusThreadManagerLinux::Shutdown(); | 89 bluez::DBusThreadManagerLinux::Shutdown(); |
90 #endif | 90 #endif |
91 | 91 |
92 ChromeBrowserMainPartsPosix::PostDestroyThreads(); | 92 ChromeBrowserMainPartsPosix::PostDestroyThreads(); |
93 } | 93 } |
OLD | NEW |