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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/display_error_observer_chromeos.h" 5 #include "ash/display/display_error_observer_chromeos.h"
6 6
7 #include "ash/system/system_notifier.h" 7 #include "ash/system/system_notifier.h"
8 #include "grit/ash_resources.h" 8 #include "grit/ash_resources.h"
9 #include "grit/ash_strings.h" 9 #include "grit/ash_strings.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 27 matching lines...) Expand all
38 kDisplayErrorNotificationId, false /* by_user */); 38 kDisplayErrorNotificationId, false /* by_user */);
39 39
40 int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ? 40 int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ?
41 IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING : 41 IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
42 IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING; 42 IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;
43 43
44 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); 44 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
45 scoped_ptr<Notification> notification(new Notification( 45 scoped_ptr<Notification> notification(new Notification(
46 message_center::NOTIFICATION_TYPE_SIMPLE, 46 message_center::NOTIFICATION_TYPE_SIMPLE,
47 kDisplayErrorNotificationId, 47 kDisplayErrorNotificationId,
48 base::string16(), // title
48 l10n_util::GetStringUTF16(message_id), 49 l10n_util::GetStringUTF16(message_id),
49 base::string16(), // message
50 bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY), 50 bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
51 base::string16(), // display_source 51 base::string16(), // display_source
52 message_center::NotifierId( 52 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
53 message_center::NotifierId::SYSTEM_COMPONENT,
54 system_notifier::kNotifierDisplayError), 53 system_notifier::kNotifierDisplayError),
55 message_center::RichNotificationData(), 54 message_center::RichNotificationData(), NULL));
56 NULL));
57 message_center::MessageCenter::Get()->AddNotification(notification.Pass()); 55 message_center::MessageCenter::Get()->AddNotification(notification.Pass());
58 } 56 }
59 57
60 base::string16 DisplayErrorObserver:: 58 base::string16
61 GetTitleOfDisplayErrorNotificationForTest() { 59 DisplayErrorObserver::GetDisplayErrorNotificationMessageForTest() {
62 message_center::NotificationList::Notifications notifications = 60 message_center::NotificationList::Notifications notifications =
63 message_center::MessageCenter::Get()->GetVisibleNotifications(); 61 message_center::MessageCenter::Get()->GetVisibleNotifications();
64 for (message_center::NotificationList::Notifications::const_iterator iter = 62 for (message_center::NotificationList::Notifications::const_iterator iter =
65 notifications.begin(); iter != notifications.end(); ++iter) { 63 notifications.begin(); iter != notifications.end(); ++iter) {
66 if ((*iter)->id() == kDisplayErrorNotificationId) 64 if ((*iter)->id() == kDisplayErrorNotificationId)
67 return (*iter)->title(); 65 return (*iter)->message();
68 } 66 }
69 67
70 return base::string16(); 68 return base::string16();
71 } 69 }
72 70
73 } // namespace ash 71 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_observer_chromeos.h ('k') | ash/display/display_error_observer_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698