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 | 19 |
1 files changed, 9 insertions, 10 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 793212ae4929..71825275763a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,7 +1,7 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -181,7 +181,7 @@ - #include "chrome/browser/lifetime/application_lifetime.h" +@@ -183,7 +183,7 @@ + #include "chrome/browser/feedback/feedback_profile_observer.h" #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -276,7 +276,7 @@ +@@ -274,7 +274,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,20 +18,19 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -479,10 +479,10 @@ void RegisterComponentsForUpdate() { +@@ -477,9 +477,9 @@ void RegisterComponentsForUpdate() { #if !defined(OS_ANDROID) RegisterPepperFlashComponent(cus); -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - RegisterSwiftShaderComponent(cus); RegisterWidevineCdmComponent(cus); -#endif // !defined(OS_CHROMEOS) +#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD) #endif // !defined(OS_ANDROID) #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) -@@ -764,7 +764,7 @@ void ChromeBrowserMainParts::SetupFieldT +@@ -761,7 +761,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() { field_trial_synchronizer_ = new FieldTrialSynchronizer(); #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -39,8 +38,8 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); #endif - -@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr + metrics::RendererUptimeTracker::Initialize(); +@@ -1191,11 +1191,11 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -54,7 +53,7 @@ // Initialize tracking synchronizer system. tracking_synchronizer_ = new metrics::TrackingSynchronizer( -@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS +@@ -1374,7 +1374,7 @@ void ChromeBrowserMainParts::PreBrowserStart() { // 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. |