Fixup layout of power and sms notifications.

ash/system/network/tray_sms.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/network/tray_sms.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 20 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/network/network_sms_handler.h"
 #endif
 
 namespace {
 
 // Min height of the list of messages in the popup.
 const int kMessageListMinHeight = 200;
 // Top/bottom padding of the text items.
 const int kPaddingVertical = 10;
-const int kSmsIconWidth = 50;
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 class SmsObserverBase {
  public:
   explicit SmsObserverBase(TraySms* tray) : tray_(tray) {}
   virtual ~SmsObserverBase() {}
@@ skipping 196 matching lines @@
 
     return msg_width;
   }
 
   int LayoutNotificationView() {
     icon_ = new views::ImageView;
     icon_->SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
 
     int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
-        kTrayPopupPaddingHorizontal - kSmsIconWidth;
+        kTrayPopupPaddingHorizontal - kNotificationIconWidth;
 
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
     // Icon
-    columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
+    columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                        0 /* resize percent */,
-                       views::GridLayout::FIXED, kSmsIconWidth, kSmsIconWidth);
+                       views::GridLayout::FIXED,
+                       kNotificationIconWidth, kNotificationIconWidth);
+
+    columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
 
     // Message
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                        0 /* resize percent */,
                        views::GridLayout::FIXED, msg_width, msg_width);
 
+    // Layout rows
     layout->AddPaddingRow(0, kPaddingVertical);
 
     layout->StartRow(0, 0);
     layout->AddView(icon_, 1, 2);  // 2 rows for icon
     layout->AddView(number_label_);
     layout->StartRow(0, 0);
     layout->SkipColumns(1);
     layout->AddView(message_label_);
     layout->StartRow(0, 0);
 
@@ skipping 188 matching lines @@
     }
     if (detailed_)
       detailed_->Update();
     else if (notify)
       ShowNotificationView();
   }
 }
 
 }  // namespace internal
 }  // namespace ash