Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3189)

Unified Diff: ash/display/display_error_observer_chromeos.cc

Issue 1190783003: Move "Dear Monitor..." error text from the notification title field to the message field to prevent… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move "Dear Monitor..." error text from the notification title field to the message field to prevent… Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/display_error_observer_chromeos.cc
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc
index 91e07db26008460c77bf17ccebe8a8d8c5b18fe5..8d10a5e03aea8dde53152d28582b4428a66a09c5 100644
--- a/ash/display/display_error_observer_chromeos.cc
+++ b/ash/display/display_error_observer_chromeos.cc
@@ -45,15 +45,13 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed(
scoped_ptr<Notification> notification(new Notification(
message_center::NOTIFICATION_TYPE_SIMPLE,
kDisplayErrorNotificationId,
+ base::string16(), // title
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,
+ message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
system_notifier::kNotifierDisplayError),
- message_center::RichNotificationData(),
- NULL));
+ message_center::RichNotificationData(), NULL));
message_center::MessageCenter::Get()->AddNotification(notification.Pass());
}
@@ -70,4 +68,18 @@ base::string16 DisplayErrorObserver::
return base::string16();
}
+base::string16
+DisplayErrorObserver::GetDisplayErrorNotificationMessageForTest() {
+ 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)->message();
+ }
+
+ return base::string16();
+}
+
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698