summaryrefslogtreecommitdiff
path: root/devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc')
-rw-r--r--devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc72
1 files changed, 0 insertions, 72 deletions
diff --git a/devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc b/devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc
deleted file mode 100644
index a03fc751952e..000000000000
--- a/devel/electron5/files/patch-chrome_browser_chrome__browser__main.cc
+++ /dev/null
@@ -1,72 +0,0 @@
---- chrome/browser/chrome_browser_main.cc.orig 2019-04-08 08:32:43 UTC
-+++ chrome/browser/chrome_browser_main.cc
-@@ -217,7 +217,7 @@
- #include "chromeos/settings/cros_settings_names.h"
- #endif // defined(OS_CHROMEOS)
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-
-@@ -257,7 +257,7 @@
- #endif // defined(OS_WIN)
-
- #if defined(OS_WIN) || defined(OS_MACOSX) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
- #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
- #endif
-
-@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
- }
-
--#if defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- // 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 .
-@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- &user_native_messaging_dir));
- if (!base::PathExists(user_native_messaging_dir))
- base::CreateDirectory(user_native_messaging_dir);
--#endif // defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- }
- #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX)
- // Set the product channel for crash reports.
- breakpad::SetChannelCrashKey(chrome::GetChannelName());
--#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif // defined(OS_LINUX)
-
- #if defined(OS_MACOSX)
- // Get the Keychain API to register for distributed notifications on the main
-@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- }
-
- #if defined(OS_WIN) || defined(OS_MACOSX) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
- metrics::DesktopSessionDurationTracker::Initialize();
- #endif
- metrics::RendererUptimeTracker::Initialize();
-@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
- base::TimeDelta::FromMinutes(1));
-
- #if !defined(OS_ANDROID)
-+#if !defined(OS_BSD)
- if (base::FeatureList::IsEnabled(features::kWebUsb)) {
- web_usb_detector_.reset(new WebUsbDetector());
- BrowserThread::PostAfterStartupTask(
-@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
- base::BindOnce(&WebUsbDetector::Initialize,
- base::Unretained(web_usb_detector_.get())));
- }
-+#endif
- if (base::FeatureList::IsEnabled(features::kTabMetricsLogging)) {
- // Initialize the TabActivityWatcher to begin logging tab activity events.
- resource_coordinator::TabActivityWatcher::GetInstance();