diff options
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.cc | 21 |
1 files changed, 6 insertions, 15 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 b94d601d1cb5..e1be471e0789 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 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/chrome_browser_main.cc 2018-07-14 13:55:52.288113000 +0200 -@@ -211,7 +211,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2018-11-19 19:55:03.000000000 +0100 ++++ chrome/browser/chrome_browser_main.cc 2018-12-04 14:28:26.209004000 +0100 +@@ -214,7 +214,7 @@ #include "chromeos/settings/cros_settings_names.h" #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -251,7 +251,7 @@ +@@ -255,7 +255,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -1342,10 +1342,10 @@ +@@ -1279,10 +1279,10 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -31,7 +31,7 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1369,7 +1369,7 @@ +@@ -1306,7 +1306,7 @@ } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -40,12 +40,3 @@ metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1514,7 +1514,7 @@ - - // Start the tab manager here so that we give the most amount of time for the - // other services to start up before we start adjusting the oom priority. --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - g_browser_process->GetTabManager()->Start(); - #endif - |