makes NotificationView aware of border.

ui/message_center/notification_view.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 "ui/message_center/notification_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 208 matching lines @@
     NotificationList::Delegate* list_delegate,
     const NotificationList::Notification& notification)
     : MessageView(list_delegate, notification) {
 }
 
 NotificationView::~NotificationView() {
 }
 
 void NotificationView::Layout() {
   if (content_view_) {
-    content_view_->SetBoundsRect(GetLocalBounds());
+    gfx::Rect contents_bounds = GetContentsBounds();
+    content_view_->SetBoundsRect(contents_bounds);
     if (close_button()) {
       gfx::Size size(close_button()->GetPreferredSize());
-      close_button()->SetBounds(width() - size.width(), 0,
+      close_button()->SetBounds(contents_bounds.right() - size.width(), 0,
                                 size.width(), size.height());
     }
   }
 }
 
 gfx::Size NotificationView::GetPreferredSize() {
-  return content_view_ ? content_view_->GetPreferredSize() : gfx::Size();
+  if (!content_view_)
+    return gfx::Size();
+  gfx::Size size = content_view_->GetPreferredSize();
+  if (border()) {
+    gfx::Insets border_insets = border()->GetInsets();
+    size.Enlarge(border_insets.width(), border_insets.height());
+  }
+  return size;
 }
 
 void NotificationView::SetUpView() {
   // This view is composed of two layers: The first layer has the notification
   // content (text, images, action buttons, ...). This is overlaid by a second
   // layer that has the notification close button and will later also have the
   // expand button. This allows the close and expand buttons to overlap the
   // content as needed to provide a large enough click area
   // (<http://crbug.com/168822> and touch area <http://crbug.com/168856>).
-  set_background(views::Background::CreateSolidBackground(kBackgroundColor));
   AddChildView(MakeContentView());
   AddChildView(close_button());
 }
 
 void NotificationView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   for (size_t i = 0; i < action_buttons_.size(); ++i) {
     if (action_buttons_[i] == sender) {
       list_delegate()->OnButtonClicked(notification().id, i);
       return;
     }
   }
   MessageView::ButtonPressed(sender, event);
 }
 
 views::View* NotificationView::MakeContentView() {
   content_view_ = new views::View();
+  content_view_->set_background(
+      views::Background::CreateSolidBackground(kBackgroundColor));
 
   // The top part of the content view is composed of an icon view on the left
   // and a certain number of text views on the right (title and message or list
   // items), followed by a padding view. Laying out the icon view will require
   // information about the text views, so these are created first and collected
   // in this vector.
   std::vector<views::View*> texts;
 
   // Title if it exists.
   if (!notification().title.empty()) {
@@ skipping 100 matching lines @@
     action_buttons_.push_back(button);
     layout->StartRow(0, 0);
     layout->AddView(button, 2, 1,
                     views::GridLayout::FILL, views::GridLayout::FILL, 0, 40);
   }
 
   return content_view_;
 }
 
 }  // namespace message_center