summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__browser__main.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index ff6af844c16f..1a6abd9da1e9 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2021-09-24 04:25:58 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2021-12-14 11:44:57 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -260,7 +260,7 @@
+@@ -261,7 +261,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
-@@ -942,7 +942,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
}
@@ -18,7 +18,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -960,7 +960,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
&user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
@@ -27,7 +27,7 @@
}
#endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -976,7 +976,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -985,7 +985,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
@@ -36,15 +36,15 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
-@@ -1146,6 +1146,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
- base::TimeDelta::FromMinutes(1));
+@@ -1177,6 +1177,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+ base::Minutes(1));
#if !defined(OS_ANDROID)
+#if !defined(OS_BSD)
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
web_usb_detector_ = std::make_unique<WebUsbDetector>();
content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
-@@ -1153,6 +1154,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1184,6 +1185,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::BindOnce(&WebUsbDetector::Initialize,
base::Unretained(web_usb_detector_.get())));
}