diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
| commit | 03d66a659ae5011ca0d5279cafb1596a982a06d8 (patch) | |
| tree | b8c8cd52f300381a02e32bdea5d4eae6f30262fc /www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc | |
| parent | Update to 1.37.0 (diff) | |
www/chromium: update to 78.0.3904.87
Submitted by: Matthias Wolf via github
MFH: 2019Q4
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 67f7eab232ce..a0ae6605a320 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-07-24 18:58:12 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -119,7 +119,7 @@ +@@ -121,7 +121,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -307,11 +307,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -313,11 +313,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,5 +21,5 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktop)) { - HatsHelper::CreateForWebContents(web_contents); + features::kHappinessTrackingSurveysForDesktop) || + base::FeatureList::IsEnabled( |