Add material design icon to mobile data notifications.

This CL adds new material design icon to mobile data notifications.
This CL also adds title "Mobile Data" to the notification.

The icon is effective only when
chrome://flags/#enable-message-center-new-style-notification
is Enabled (which is ToT default).

TEST=manual
BUG=726241

Change-Id: Ia71759dbbe44b1472721c784bb4e1c59b9a7df53
Reviewed-on: https://chromium-review.googlesource.com/666399
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502798}

chrome/app/chromeos_strings.grdp

@@ -4369,6 +4369,9 @@ All users must sign out to continue.
   </message>
 
   <!-- 3G data Notifications -->
+  <message name="IDS_MOBILE_DATA_NOTIFICATION_TITLE" desc="Title of notification telling that mobile data is enabled.">
+    Mobile data
+  </message>
   <message name="IDS_3G_NOTIFICATION_MESSAGE" desc="Text of the 3G data notification telling that 3G data is enabled.">
     Google Chrome will use mobile data if you're not connected to another network.
   </message>

chrome/app/vector_icons/BUILD.gn

@@ -125,6 +125,7 @@ aggregate_vector_icons("chrome_vector_icons") {
       "arc_migrate_encryption_notification.icon",
       "notification_captive_portal.icon",
       "notification_google.icon",
+      "notification_mobile_data.icon",
       "notification_play_prism.icon",
       "notification_storage_full.icon",
       "notification_warning.icon",

chrome/app/vector_icons/notification_mobile_data.icon

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 18,
+MOVE_TO, 2, 16,
+R_H_LINE_TO, 14,
+V_LINE_TO, 2,
+CLOSE,
+END

chrome/browser/chromeos/status/data_promo_notification.cc

@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/mobile_config.h"
@@ -267,11 +268,21 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification() {
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(icon_id);
 
+  std::unique_ptr<message_center::Notification> notification =
+      ash::system_notifier::CreateSystemNotification(
+          message_center::NOTIFICATION_TYPE_SIMPLE, kDataPromoNotificationId,
+          l10n_util::GetStringUTF16(IDS_MOBILE_DATA_NOTIFICATION_TITLE),
+          message, icon, base::string16() /* display_source */, GURL(),
+          message_center::NotifierId(
+              message_center::NotifierId::SYSTEM_COMPONENT,
+              ash::system_notifier::kNotifierNetwork),
+          message_center::RichNotificationData(),
+          new message_center::HandleNotificationClickedDelegate(base::Bind(
+              &NotificationClicked, default_network->guid(), info_url)),
+          kNotificationMobileDataIcon,
+          message_center::SystemNotificationWarningLevel::NORMAL);
   message_center::MessageCenter::Get()->AddNotification(
-      message_center::Notification::CreateSystemNotification(
-          kDataPromoNotificationId, base::string16() /* title */, message, icon,
-          ash::system_notifier::kNotifierNetwork,
-          base::Bind(&NotificationClicked, default_network->guid(), info_url)));
+      std::move(notification));
 
   SetShow3gPromoNotification(false);
   if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
@@ -304,11 +315,20 @@ bool DataPromoNotification::ShowDataSaverNotification() {
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_AURA_UBER_TRAY_NETWORK_NOTIFICATION_DATASAVER);
 
-  message_center::MessageCenter::Get()->AddNotification(
+  std::unique_ptr<message_center::Notification> notification =
       message_center::Notification::CreateSystemNotification(
-          kDataSaverNotificationId, title, message, icon,
-          ash::system_notifier::kNotifierNetwork,
-          base::Bind(&NotificationClicked, "", kDataSaverExtensionUrl)));
+          message_center::NOTIFICATION_TYPE_SIMPLE, kDataSaverNotificationId,
+          title, message, icon, base::string16() /* display_source */, GURL(),
+          message_center::NotifierId(
+              message_center::NotifierId::SYSTEM_COMPONENT,
+              ash::system_notifier::kNotifierNetwork),
+          message_center::RichNotificationData(),
+          new message_center::HandleNotificationClickedDelegate(
+              base::Bind(&NotificationClicked, "", kDataSaverExtensionUrl)),
+          kNotificationMobileDataIcon,
+          message_center::SystemNotificationWarningLevel::NORMAL);
+  message_center::MessageCenter::Get()->AddNotification(
+      std::move(notification));
   base::RecordAction(base::UserMetricsAction("DataSaverPrompt_Shown"));
 
   if (DataSaverSwitchDemoMode()) {