blob: fb5b5d6cd9639bbb6cf819ce68057374621d6c88 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- chrome/browser/after_startup_task_utils.cc.orig 2020-03-16 18:39:43 UTC
+++ chrome/browser/after_startup_task_utils.cc
@@ -33,7 +33,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -120,7 +120,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
void SetBrowserStartupIsComplete() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() {
UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime",
base::Time::Now() - process_creation_time);
}
-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount",
g_after_startup_tasks.Get().size());
g_startup_complete_flag.Get().Set();
@@ -137,7 +137,7 @@ void SetBrowserStartupIsComplete() {
g_after_startup_tasks.Get().clear();
g_after_startup_tasks.Get().shrink_to_fit();
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// Make sure we complete the startup notification sequence, or launchers will
// get confused by not receiving the expected message from the main process.
views::LinuxUI* linux_ui = views::LinuxUI::instance();
|