Move "Dear Monitor..." error text from the notification title field to the message field to prevent…

ash/display/display_error_observer_chromeos.cc

 // Copyright 2013 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.
 
 #include "ash/display/display_error_observer_chromeos.h"
 
 #include "ash/system/system_notifier.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 25 matching lines @@
   // as a popup in any situation.
   message_center::MessageCenter::Get()->RemoveNotification(
       kDisplayErrorNotificationId, false /* by_user */);
 
   int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ?
       IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
       IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   scoped_ptr<Notification> notification(new Notification(
-      message_center::NOTIFICATION_TYPE_SIMPLE,
-      kDisplayErrorNotificationId,
+      message_center::NOTIFICATION_TYPE_SIMPLE, kDisplayErrorNotificationId,

[Jun Mukai, 2015/06/17 21:54:43]

Please keep the original linebreak

[Jun Mukai, 2015/06/17 22:32:53]

You miss this comment. Put a line break between NOTIFICATION_TYPE_SIMPLE and
kDisplayErrorNotificationId as the original comment has.

[rfrappier, 2015/06/18 15:39:53]

Done.

+      base::string16(),  // message

[Jun Mukai, 2015/06/17 21:54:43]

Please update the comment. Now this is title, not message.

[rfrappier, 2015/06/18 15:39:53]

Done.

       l10n_util::GetStringUTF16(message_id),
-      base::string16(),  // message
       bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
       base::string16(),  // display_source
-      message_center::NotifierId(
-          message_center::NotifierId::SYSTEM_COMPONENT,
-          system_notifier::kNotifierDisplayError),
-      message_center::RichNotificationData(),
-      NULL));
+      message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
+                                 system_notifier::kNotifierDisplayError),
+      message_center::RichNotificationData(), NULL));
   message_center::MessageCenter::Get()->AddNotification(notification.Pass());
 }
 
 base::string16 DisplayErrorObserver::
     GetTitleOfDisplayErrorNotificationForTest() {
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (message_center::NotificationList::Notifications::const_iterator iter =
            notifications.begin(); iter != notifications.end(); ++iter) {
     if ((*iter)->id() == kDisplayErrorNotificationId)
       return (*iter)->title();
   }
 
   return base::string16();
 }
 
 }  // namespace ash