Update End Of Life notification strings and style

- changed the strings to match the new spec
- used ui::GetChromeOSDeviceName() in the notification text to
  show the correct device type (Chromebook/Chromebase etc).
- changed the notification type to NORMAL
- changed the display source from custom to default ("Chrome OS")
- changed the notification icon, used a MD asset
  (ic_info_outline_48px.svg scaled to 96px)

Bug: 957178
Test: manual
Change-Id: I3bf29c6ca8dba98fd80d9a43637354e560f0ca4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1617012
Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663884}

ash/public/cpp/vector_icons/notification_end_of_support.icon

@@ -3,41 +3,27 @@
 // found in the LICENSE file.
 
 CANVAS_DIMENSIONS, 96,
-MOVE_TO, 71.34f, 15.46f,
-R_CUBIC_TO, 3.55f, 2.54f, 6.65f, 5.65f, 9.2f, 9.2f,
-R_CUBIC_TO, 4.68f, 6.52f, 7.46f, 14.5f, 7.46f, 23.14f,
-CUBIC_TO, 88, 56.44f, 85.22f, 64.42f, 80.49f, 71,
-LINE_TO, 62, 53,
-R_H_LINE_TO, 6,
-LINE_TO, 48.2f, 27.9f,
-R_LINE_TO, -4.8f, 6.01f,
-CUBIC_TO_SHORTHAND, 25.04f, 15.48f, 25.06f, 15.46f,
-CUBIC_TO, 31.59f, 10.79f, 39.56f, 8, 48.2f, 8,
-R_CUBIC_TO, 8.64f, 0, 16.61f, 2.79f, 23.14f, 7.46f,
+MOVE_TO, 44, 68,
+LINE_TO, 52, 68,
+LINE_TO, 52, 44,
+LINE_TO, 44, 44,
 CLOSE,
-R_MOVE_TO, 9.51f, 64.84f,
-LINE_TO, 84, 83.44f,
-LINE_TO, 79.44f, 88,
-R_LINE_TO, -7.81f, -7.7f,
-R_CUBIC_TO, -6.57f, 4.72f, -14.61f, 7.52f, -23.31f, 7.52f,
-R_CUBIC_TO, -8.71f, 0, -16.74f, -2.8f, -23.31f, -7.52f,
-R_CUBIC_TO, -3.57f, -2.56f, -6.7f, -5.69f, -9.27f, -9.26f,
-R_CUBIC_TO, -4.71f, -6.57f, -7.52f, -14.61f, -7.52f, -23.31f,
-R_CUBIC_TO, 0, -8.71f, 2.8f, -16.74f, 7.52f, -23.42f,
-LINE_TO, 8, 16.56f,
-LINE_TO, 12.56f, 12,
-R_LINE_TO, 3.18f, 3.18f,
-R_LINE_TO, 4.21f, 4.21f,
-LINE_TO, 39.39f, 38.83f,
-R_LINE_TO, 18.95f, 18.87f,
-LINE_TO, 76.69f, 76.05f,
-R_LINE_TO, 4.17f, 4.25f,
+MOVE_TO, 48, 8,
+CUBIC_TO, 25.9f, 8, 8, 25.9f, 8, 48,
+CUBIC_TO, 8, 70.1f, 25.9f, 88, 48, 88,
+CUBIC_TO, 70.1f, 88, 88, 70.1f, 88, 48,
+CUBIC_TO, 88, 25.9f, 70.1f, 8, 48, 8,
 CLOSE,
-MOVE_TO, 57, 68,
-R_V_LINE_TO, -1.33f,
-LINE_TO, 34.91f, 44,
-LINE_TO, 28, 53,
-R_H_LINE_TO, 9,
-R_V_LINE_TO, 15,
-R_H_LINE_TO, 20,
-CLOSE
+MOVE_TO, 48, 80,
+CUBIC_TO, 30.36f, 80, 16, 65.64f, 16, 48,
+CUBIC_TO, 16, 30.36f, 30.36f, 16, 48, 16,
+CUBIC_TO, 65.64f, 16, 80, 30.36f, 80, 48,
+CUBIC_TO, 80, 65.64f, 65.64f, 80, 48, 80,
+CLOSE,
+MOVE_TO, 44, 36,
+LINE_TO, 52, 36,
+LINE_TO, 52, 28,
+LINE_TO, 44, 28,
+CLOSE,
+MOVE_TO, 44, 36,
+CLOSE
\ No newline at end of file

chrome/app/chromeos_strings.grdp

@@ -2168,14 +2168,11 @@
   </message>
 
   <!-- EOL Notification Strings -->
-  <message name="IDS_EOL_NOTIFICATION_DISPLAY_SOURCE" desc="Notification header title shown to inform the user that this device is no longer supported.">
-    End of support
-  </message>
   <message name="IDS_EOL_NOTIFICATION_TITLE" desc="Notification title shown to inform the user that this device is no longer supported.">
-    This device is no longer supported
+    Final software update
   </message>
   <message name="IDS_EOL_NOTIFICATION_EOL" desc="Notification shown to inform the user that this device will no longer receive latest software updates.">
-    This device will no longer receive the latest software updates. Please consider upgrading.
+    This is the last automatic software and security update for this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. To get future updates, upgrade to a newer model.
   </message>
   <message name="IDS_EOL_DISMISS_BUTTON" desc="A button label shown in the notification for eol status change to dismiss the notification.">
     Don't remind me again

chrome/browser/chromeos/eol_notification.cc

@@ -21,6 +21,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/public/cpp/notification.h"
@@ -148,15 +149,15 @@ void EolNotification::Update() {
       ash::CreateSystemNotification(
           message_center::NOTIFICATION_TYPE_SIMPLE, kEolNotificationId,
           GetStringUTF16(IDS_EOL_NOTIFICATION_TITLE),
-          GetStringUTF16(IDS_EOL_NOTIFICATION_EOL),
-          GetStringUTF16(IDS_EOL_NOTIFICATION_DISPLAY_SOURCE),
-          GURL(kEolNotificationId),
+          l10n_util::GetStringFUTF16(IDS_EOL_NOTIFICATION_EOL,
+                                     ui::GetChromeOSDeviceName()),
+          base::string16() /* display_source */, GURL(kEolNotificationId),
           message_center::NotifierId(
               message_center::NotifierType::SYSTEM_COMPONENT,
               kEolNotificationId),
           data, new EolNotificationDelegate(profile_),
           ash::kNotificationEndOfSupportIcon,
-          message_center::SystemNotificationWarningLevel::CRITICAL_WARNING);
+          message_center::SystemNotificationWarningLevel::NORMAL);
 
   NotificationDisplayServiceFactory::GetForProfile(profile_)->Display(
       NotificationHandler::Type::TRANSIENT, *notification,