Fixup layout of power and sms notifications.

ash/system/power/tray_power.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/power/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
@@ skipping 113 matching lines @@
 // This view is used only for the popup.
 class PowerStatusView : public views::View {
  public:
   enum ViewType {
     VIEW_DEFAULT,
     VIEW_NOTIFICATION
   };
 
   explicit PowerStatusView(ViewType view_type) {
     status_label_ = new views::Label;
-    status_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
+    status_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     time_label_ = new views::Label;
-    time_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
+    time_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
     icon_ = new views::ImageView;
 
     AddChildView(status_label_);
     AddChildView(time_label_);
     AddChildView(icon_);
 
     if (view_type == VIEW_DEFAULT)
       LayoutDefaultView();
     else
@@ skipping 45 matching lines @@
     layout->AddView(icon_, 1, 3);  // 3 rows for icon
 
     layout->AddPaddingRow(0, kPaddingVertical/3);
     layout->StartRow(0, 0);
     layout->AddView(time_label_);
 
     layout->AddPaddingRow(0, kPaddingVertical);
   }
 
   void LayoutNotificationView() {
+    const int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
+        kTrayPopupPaddingHorizontal - kNotificationIconWidth;
+
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
     // Icon
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                       0, views::GridLayout::USE_PREF, 0, 0);
+                       0 /* resize percent */,
+                       views::GridLayout::FIXED,
+                       kNotificationIconWidth, kNotificationIconWidth);
 
     columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
 
     // Status + Time
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                       0, views::GridLayout::USE_PREF, 0, kLabelMinWidth);
+                       0 /* resize percent */,
+                       views::GridLayout::FIXED, msg_width, msg_width);
 
-    layout->AddPaddingRow(0, kPaddingVertical);
+    // Layout rows
+    layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
 
     layout->StartRow(0, 0);
-    layout->AddView(icon_, 1, 3);  // 3 rows for icon
+    layout->AddView(icon_, 1, 2);  // 2 rows for icon
     layout->AddView(status_label_);
-    layout->AddPaddingRow(0, kPaddingVertical/3);
 
     layout->StartRow(0, 0);
     layout->SkipColumns(1);
     layout->AddView(time_label_);
 
     layout->AddPaddingRow(0, kPaddingVertical);
   }
 
   void UpdateText() {
     base::TimeDelta time = base::TimeDelta::FromSeconds(
@@ skipping 181 matching lines @@
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash