Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
| --- chrome/browser/ui/tab_helpers.cc.orig 2019-12-16 21:51:24 UTC | --- chrome/browser/ui/tab_helpers.cc.orig 2020-03-03 18:53:52 UTC | ||||
| +++ chrome/browser/ui/tab_helpers.cc | +++ chrome/browser/ui/tab_helpers.cc | ||||
| @@ -122,7 +122,7 @@ | @@ -124,7 +124,7 @@ | ||||
| #include "components/zoom/zoom_controller.h" | #include "components/zoom/zoom_controller.h" | ||||
| #endif // defined(OS_ANDROID) | #endif // defined(OS_ANDROID) | ||||
| -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) | -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) | ||||
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | ||||
| #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" | #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" | ||||
| #include "chrome/browser/ui/hats/hats_helper.h" | #include "chrome/browser/ui/hats/hats_helper.h" | ||||
| #endif | #endif | ||||
| @@ -314,11 +314,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con | @@ -329,11 +329,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con | ||||
| #endif | #endif | ||||
| #if defined(OS_WIN) || defined(OS_MACOSX) || \ | #if defined(OS_WIN) || defined(OS_MACOSX) || \ | ||||
| - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | ||||
| + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); | metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); | ||||
| #endif | #endif | ||||
| -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) | -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) | ||||
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | ||||
| if (base::FeatureList::IsEnabled( | if (base::FeatureList::IsEnabled( | ||||
| features::kHappinessTrackingSurveysForDesktop) || | features::kHappinessTrackingSurveysForDesktop) || | ||||
| base::FeatureList::IsEnabled( | base::FeatureList::IsEnabled( | ||||