summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 17:31:57 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 17:31:57 +0000
commit46812fefc7af7f252ecb5beeff1d2971ee922376 (patch)
tree73d9b90dd62147ab999a1ffe93813f13cc17ed6b
parent20e53a742314fc6193989733ff004a16bcc51e28 (diff)
downloadchromium_src-46812fefc7af7f252ecb5beeff1d2971ee922376.zip
chromium_src-46812fefc7af7f252ecb5beeff1d2971ee922376.tar.gz
chromium_src-46812fefc7af7f252ecb5beeff1d2971ee922376.tar.bz2
Merge 159388 - Fix resize percent for message layout
The message width is pre-calculated so resize precent should be 0 to ensure correct layout. BUG=151813 TEST=See issue Review URL: https://chromiumcodereview.appspot.com/10996070 TBR=stevenjb@chromium.org Review URL: https://codereview.chromium.org/11035005 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@159519 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/system/web_notification/web_notification_tray.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index ecfeb21..b176948 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -458,8 +458,9 @@ class WebNotificationView : public views::View,
const int message_width = kWebNotificationWidth - kWebNotificationIconSize -
kWebNotificationButtonWidth - (padding_width * 3);
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING,
- 100, /* resize percent */
- views::GridLayout::FIXED, message_width, message_width);
+ 0, /* resize percent */
+ views::GridLayout::FIXED,
+ message_width, message_width);
columns->AddPaddingColumn(0, padding_width);