summaryrefslogtreecommitdiffstats
path: root/ui/message_center
diff options
context:
space:
mode:
authorpetewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 15:19:07 +0000
committerpetewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 15:19:07 +0000
commitcbdb11343ba2aeb71b613ef56694fd7b1d4754ba (patch)
treedb23681a67127ff1d4bf5d406e26e264cb172c51 /ui/message_center
parent626aeaacef90be9ec60b3d5fb067972f963e31c6 (diff)
downloadchromium_src-cbdb11343ba2aeb71b613ef56694fd7b1d4754ba.zip
chromium_src-cbdb11343ba2aeb71b613ef56694fd7b1d4754ba.tar.gz
chromium_src-cbdb11343ba2aeb71b613ef56694fd7b1d4754ba.tar.bz2
Fix the notification center label.
Fix the notification center label to read "Chromium Notifications" or "Chrome Notifications" instead of "Notifications" on Win and Linux and CrOS. Mac is already working properly. Passed message_center_unittests and interactive_ui_tests BUG=350449 Review URL: https://codereview.chromium.org/318173002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
-rw-r--r--ui/message_center/views/message_center_bubble.cc5
-rw-r--r--ui/message_center/views/message_center_bubble.h2
-rw-r--r--ui/message_center/views/message_center_button_bar.cc6
-rw-r--r--ui/message_center/views/message_center_button_bar.h3
-rw-r--r--ui/message_center/views/message_center_view.cc6
-rw-r--r--ui/message_center/views/message_center_view.h3
-rw-r--r--ui/message_center/views/message_center_view_unittest.cc3
7 files changed, 18 insertions, 10 deletions
diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc
index 7189d27..c210cdc 100644
--- a/ui/message_center/views/message_center_bubble.cc
+++ b/ui/message_center/views/message_center_bubble.cc
@@ -96,8 +96,9 @@ void MessageCenterBubble::InitializeContents(
tray(),
max_height(),
initially_settings_visible_,
- false /* MessageCenterBubble should be used only on ChromeOS.
- Message center is never shown top down in ChromeOS. */);
+ false, /* MessageCenterBubble should be used only on ChromeOS.
+ Message center is never shown top down in ChromeOS. */
+ title_);
bubble_view()->AddChildView(new ContentsView(this, message_center_view_));
// Resize the content of the bubble view to the given bubble size. This is
// necessary in case of the bubble border forcing a bigger size then the
diff --git a/ui/message_center/views/message_center_bubble.h b/ui/message_center/views/message_center_bubble.h
index 521bf4a..1173a95 100644
--- a/ui/message_center/views/message_center_bubble.h
+++ b/ui/message_center/views/message_center_bubble.h
@@ -55,6 +55,8 @@ class MESSAGE_CENTER_EXPORT MessageCenterBubble
// the used anchor.
bool first_item_has_no_margin_;
+ base::string16 title_;
+
DISALLOW_COPY_AND_ASSIGN(MessageCenterBubble);
};
diff --git a/ui/message_center/views/message_center_button_bar.cc b/ui/message_center/views/message_center_button_bar.cc
index c889490..8008115 100644
--- a/ui/message_center/views/message_center_button_bar.cc
+++ b/ui/message_center/views/message_center_button_bar.cc
@@ -91,7 +91,8 @@ MessageCenterButtonBar::MessageCenterButtonBar(
MessageCenterView* message_center_view,
MessageCenter* message_center,
NotifierSettingsProvider* notifier_settings_provider,
- bool settings_initially_visible)
+ bool settings_initially_visible,
+ const base::string16& title)
: message_center_view_(message_center_view),
message_center_(message_center),
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -120,8 +121,7 @@ MessageCenterButtonBar::MessageCenterButtonBar(
title_arrow_->SetFocusable(false);
AddChildView(title_arrow_);
- notification_label_ = new views::Label(
- l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_FOOTER_TITLE));
+ notification_label_ = new views::Label(title);
notification_label_->SetAutoColorReadabilityEnabled(false);
notification_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
notification_label_->SetEnabledColor(kRegularTextColor);
diff --git a/ui/message_center/views/message_center_button_bar.h b/ui/message_center/views/message_center_button_bar.h
index 524a01f..bc87dbe 100644
--- a/ui/message_center/views/message_center_button_bar.h
+++ b/ui/message_center/views/message_center_button_bar.h
@@ -30,7 +30,8 @@ class MessageCenterButtonBar : public views::View,
MessageCenterButtonBar(MessageCenterView* message_center_view,
MessageCenter* message_center,
NotifierSettingsProvider* notifier_settings_provider,
- bool settings_initially_visible);
+ bool settings_initially_visible,
+ const base::string16& title);
virtual ~MessageCenterButtonBar();
// Enables or disables all of the buttons in the center. This is used to
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc
index 35177b8..0f003ed 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -535,7 +535,8 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center,
MessageCenterTray* tray,
int max_height,
bool initially_settings_visible,
- bool top_down)
+ bool top_down,
+ const base::string16& title)
: message_center_(message_center),
tray_(tray),
scroller_(NULL),
@@ -559,7 +560,8 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center,
button_bar_ = new MessageCenterButtonBar(this,
message_center,
notifier_settings_provider,
- initially_settings_visible);
+ initially_settings_visible,
+ title);
const int button_height = button_bar_->GetPreferredSize().height();
diff --git a/ui/message_center/views/message_center_view.h b/ui/message_center/views/message_center_view.h
index 6264bb3..94dd139 100644
--- a/ui/message_center/views/message_center_view.h
+++ b/ui/message_center/views/message_center_view.h
@@ -48,7 +48,8 @@ class MESSAGE_CENTER_EXPORT MessageCenterView : public views::View,
MessageCenterTray* tray,
int max_height,
bool initially_settings_visible,
- bool top_down);
+ bool top_down,
+ const base::string16& title);
virtual ~MessageCenterView();
void SetNotifications(const NotificationList::Notifications& notifications);
diff --git a/ui/message_center/views/message_center_view_unittest.cc b/ui/message_center/views/message_center_view_unittest.cc
index 99fa804..3335ed8 100644
--- a/ui/message_center/views/message_center_view_unittest.cc
+++ b/ui/message_center/views/message_center_view_unittest.cc
@@ -144,8 +144,9 @@ void MessageCenterViewTest::SetUp() {
notifications.insert(&notification);
// Then create a new MessageCenterView with that single notification.
+ base::string16 title;
message_center_view_.reset(new MessageCenterView(
- &message_center_, NULL, 100, false, /*top_down =*/false));
+ &message_center_, NULL, 100, false, /*top_down =*/false, title));
message_center_view_->SetNotifications(notifications);
// Remove and delete the NotificationView now owned by the MessageCenterView's