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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 | 43 |
44 ChromeBrowserMainPartsPosix::ToolkitInitialized(); | 44 ChromeBrowserMainPartsPosix::ToolkitInitialized(); |
45 } | 45 } |
46 | 46 |
47 void ChromeBrowserMainPartsLinux::PreProfileInit() { | 47 void ChromeBrowserMainPartsLinux::PreProfileInit() { |
48 #if !defined(OS_CHROMEOS) | 48 #if !defined(OS_CHROMEOS) |
49 // Needs to be called after we have chrome::DIR_USER_DATA and | 49 // Needs to be called after we have chrome::DIR_USER_DATA and |
50 // g_browser_process. This happens in PreCreateThreads. | 50 // g_browser_process. This happens in PreCreateThreads. |
51 // base::GetLinuxDistro() will initialize its value if needed. | 51 // base::GetLinuxDistro() will initialize its value if needed. |
52 base::PostTaskWithTraits( | 52 base::PostTaskWithTraits( |
53 FROM_HERE, base::TaskTraits().MayBlock().WithPriority( | 53 FROM_HERE, |
54 base::TaskPriority::BACKGROUND), | 54 base::TaskTraits().MayBlock().WithPriority( |
55 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); | 55 base::TaskPriority::BACKGROUND), |
| 56 base::BindOnce(base::IgnoreResult(&base::GetLinuxDistro))); |
56 #endif | 57 #endif |
57 | 58 |
58 media::AudioManager::SetGlobalAppName( | 59 media::AudioManager::SetGlobalAppName( |
59 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); | 60 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); |
60 | 61 |
61 #if !defined(OS_CHROMEOS) | 62 #if !defined(OS_CHROMEOS) |
62 // Forward to os_crypt the flag to use a specific password store. | 63 // Forward to os_crypt the flag to use a specific password store. |
63 OSCrypt::SetStore( | 64 OSCrypt::SetStore( |
64 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore)); | 65 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore)); |
65 // Forward the product name | 66 // Forward the product name |
(...skipping 26 matching lines...) Expand all Loading... |
92 } | 93 } |
93 | 94 |
94 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { | 95 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { |
95 #if !defined(OS_CHROMEOS) | 96 #if !defined(OS_CHROMEOS) |
96 bluez::BluezDBusManager::Shutdown(); | 97 bluez::BluezDBusManager::Shutdown(); |
97 bluez::DBusThreadManagerLinux::Shutdown(); | 98 bluez::DBusThreadManagerLinux::Shutdown(); |
98 #endif | 99 #endif |
99 | 100 |
100 ChromeBrowserMainPartsPosix::PostDestroyThreads(); | 101 ChromeBrowserMainPartsPosix::PostDestroyThreads(); |
101 } | 102 } |
OLD | NEW |