mac: add 10.10 deprecation infobar

The strings in this change are from UX.

Bug: 1126056
Change-Id: I72393fbfec457d80f07f5d44dc457e29bcc42d9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422479Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809553}

chrome/app/chromium_strings.grd

@@ -294,8 +294,8 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
         Not used in Chromium. Placeholder to keep resource maps in sync.
       </message>
       <if expr="is_macosx">
-        <message name="IDS_MAC_10_9_OBSOLETE_NOW" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using is no longer supported.">
-          Chromium may not function correctly because it is no longer supported on Mac OS X 10.9.
+        <message name="IDS_MAC_10_10_OBSOLETE_SOON" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using will soon be or is already unsupported.">
+          To get future Chromium updates, you'll need OS X 10.11 or later. This computer is using OS X 10.10.
         </message>
       </if>
       <if expr="is_win">

chrome/app/chromium_strings_grd/IDS_MAC_10_10_OBSOLETE_SOON.png.sha1

+50d3e8735ebc60cef8fdaa8418c3f9c21f132c75
\ No newline at end of file

chrome/app/google_chrome_strings.grd

@@ -300,8 +300,8 @@ chromium_strings.grd. -->
         Terms of Service
       </message>
       <if expr="is_macosx">
-        <message name="IDS_MAC_10_9_OBSOLETE_NOW" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using is no longer supported.">
-          This computer will no longer receive Google Chrome updates because Mac OS X 10.9 is no longer supported.
+        <message name="IDS_MAC_10_10_OBSOLETE_SOON" desc="A message displayed on an at-launch infobar and About (Help) page warning the user that the OS version they are using will soon be or is already unsupported.">
+          To get future Google Chrome updates, you'll need OS X 10.11 or later. This computer is using OS X 10.10.
         </message>
       </if>
       <if expr="is_win">

chrome/app/google_chrome_strings_grd/IDS_MAC_10_10_OBSOLETE_SOON.png.sha1

+18bbaf713aa604b75753f668bb35c31c0d185200
\ No newline at end of file

chrome/browser/obsolete_system/obsolete_system_mac.cc

@@ -19,13 +19,13 @@ bool ObsoleteSystem::IsObsoleteNowOrSoon() {
   int32_t major, minor, bugfix;
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
 
-  return ((major < 10) || (major == 10 && minor <= 9)) &&
-         base::FeatureList::IsEnabled(features::kShow10_9ObsoleteInfobar);
+  return ((major < 10) || (major == 10 && minor <= 10)) &&
+         base::FeatureList::IsEnabled(features::kShow10_10ObsoleteInfobar);
 }
 
 // static
 base::string16 ObsoleteSystem::LocalizedObsoleteString() {
-  return l10n_util::GetStringUTF16(IDS_MAC_10_9_OBSOLETE_NOW);
+  return l10n_util::GetStringUTF16(IDS_MAC_10_10_OBSOLETE_SOON);
 }
 
 // static
@@ -35,5 +35,5 @@ bool ObsoleteSystem::IsEndOfTheLine() {
 
 // static
 const char* ObsoleteSystem::GetLinkURL() {
-  return chrome::kMac10_9_ObsoleteURL;
+  return chrome::kMac10_10_ObsoleteURL;
 }

chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc

@@ -44,3 +44,11 @@ base::string16 ObsoleteSystemInfoBarDelegate::GetMessageText() const {
 int ObsoleteSystemInfoBarDelegate::GetButtons() const {
   return BUTTON_NONE;
 }
+
+bool ObsoleteSystemInfoBarDelegate::ShouldExpire(
+    const NavigationDetails& details) const {
+  // Since the obsolete system infobar communicates critical state ("your system
+  // is no longer receiving updates") it should persist until explicitly
+  // dismissed.
+  return false;
+}

chrome/browser/ui/startup/obsolete_system_infobar_delegate.h

@@ -30,6 +30,7 @@ class ObsoleteSystemInfoBarDelegate : public ConfirmInfoBarDelegate {
   GURL GetLinkURL() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
+  bool ShouldExpire(const NavigationDetails& details) const override;
 
   DISALLOW_COPY_AND_ASSIGN(ObsoleteSystemInfoBarDelegate);
 };

chrome/common/chrome_features.cc

@@ -658,10 +658,10 @@ const base::Feature kSharesheet{"Sharesheet",
 #endif
 
 #if defined(OS_MAC)
-// Enables the "this OS is obsolete" infobar on Mac 10.9.
-// TODO(ellyjones): Remove this after the last 10.9 release.
-const base::Feature kShow10_9ObsoleteInfobar{"Show109ObsoleteInfobar",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+// Enables the "this OS is obsolete" infobar on Mac 10.10.
+// TODO(ellyjones): Remove this after the last 10.10 release.
+const base::Feature kShow10_10ObsoleteInfobar{
+    "Show1010ObsoleteInfobar", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif  // defined(OS_MAC)
 
 #if defined(OS_ANDROID)

chrome/common/chrome_features.h

@@ -443,7 +443,7 @@ extern const base::Feature kSharesheet;
 
 #if defined(OS_MAC)
 COMPONENT_EXPORT(CHROME_FEATURES)
-extern const base::Feature kShow10_9ObsoleteInfobar;
+extern const base::Feature kShow10_10ObsoleteInfobar;
 #endif  // defined(OS_MAC)
 
 #if defined(OS_ANDROID)

chrome/common/url_constants.cc

@@ -416,7 +416,7 @@ const char kWifiSyncLearnMoreURL[] =
 const char kChromeEnterpriseSignInLearnMoreURL[] =
     "https://support.google.com/chromebook/answer/1331549";
 
-const char kMac10_9_ObsoleteURL[] =
+const char kMac10_10_ObsoleteURL[] =
     "https://support.google.com/chrome/?p=unsupported_mac";
 #endif
 

chrome/common/url_constants.h

@@ -379,8 +379,8 @@ extern const char kWifiSyncLearnMoreURL[];
 // "Learn more" URL for the enterprise sign-in confirmation dialog.
 extern const char kChromeEnterpriseSignInLearnMoreURL[];
 
-// The URL for the "learn more" link on the 10.9 obsolescence infobar.
-extern const char kMac10_9_ObsoleteURL[];
+// The URL for the "learn more" link on the 10.10 obsolescence infobar.
+extern const char kMac10_10_ObsoleteURL[];
 #endif
 
 #if defined(OS_WIN)