summaryrefslogtreecommitdiffstats
path: root/ui/message_center
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 20:31:08 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 20:31:08 +0000
commit32d162b08e65402e6b05d4afa683186c48b00906 (patch)
tree8866458a279a2e2e7eaf9ac3345c39effb165e47 /ui/message_center
parentbdb6d25cc3f4613867332b6700cdb05b409f7bad (diff)
downloadchromium_src-32d162b08e65402e6b05d4afa683186c48b00906.zip
chromium_src-32d162b08e65402e6b05d4afa683186c48b00906.tar.gz
chromium_src-32d162b08e65402e6b05d4afa683186c48b00906.tar.bz2
Customize user details in ash system bubble for public account mode
This CL customizes the user details shown at the top of the ash system bubble when logged into a public account. The regular display of user name and e-mail is replaced by a text that informs the user this is a public account and names the domain managing the account. The implementation follows the UI mock in the linked bug. BUG=152928 Review URL: https://chromiumcodereview.appspot.com/11377133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
-rw-r--r--ui/message_center/message_bubble_base.cc5
-rw-r--r--ui/message_center/message_center_bubble.cc3
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/message_center/message_bubble_base.cc b/ui/message_center/message_bubble_base.cc
index 4bbcefd..06121e3 100644
--- a/ui/message_center/message_bubble_base.cc
+++ b/ui/message_center/message_bubble_base.cc
@@ -13,7 +13,6 @@ namespace {
// Delay laying out the MessageBubbleBase until all notifications have been
// added and icons have had a chance to load.
const int kUpdateDelayMs = 50;
-const int kNotificationBubbleWidth = 300;
}
namespace message_center {
@@ -59,9 +58,9 @@ views::TrayBubbleView::InitParams MessageBubbleBase::GetDefaultInitParams(
views::TrayBubbleView::InitParams init_params(
views::TrayBubbleView::ANCHOR_TYPE_TRAY,
anchor_alignment,
- kNotificationBubbleWidth);
+ kWebNotificationWidth,
+ kWebNotificationWidth);
init_params.arrow_color = kHeaderBackgroundColorDark;
- init_params.bubble_width = kWebNotificationWidth;
return init_params;
}
diff --git a/ui/message_center/message_center_bubble.cc b/ui/message_center/message_center_bubble.cc
index 3b0e73c..b0cc14a 100644
--- a/ui/message_center/message_center_bubble.cc
+++ b/ui/message_center/message_center_bubble.cc
@@ -314,8 +314,9 @@ views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams(
views::TrayBubbleView::AnchorAlignment anchor_alignment) {
views::TrayBubbleView::InitParams init_params =
GetDefaultInitParams(anchor_alignment);
+ init_params.min_width += kMarginBetweenItems * 2;
+ init_params.max_width += kMarginBetweenItems * 2;
init_params.max_height = kMessageBubbleBaseMaxHeight;
- init_params.bubble_width += kMarginBetweenItems * 2;
init_params.can_activate = true;
return init_params;
}