Message center re-organized

ui/views/bubble/bubble_frame_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/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 61 matching lines @@
   close_->set_border(NULL);
   close_->SetVisible(false);
   AddChildView(close_);
 }
 
 BubbleFrameView::~BubbleFrameView() {}
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetLocalBounds();
   client_bounds.Inset(GetInsets());
-  client_bounds.Inset(bubble_border_->GetInsets());
+  if (bubble_border_)
+    client_bounds.Inset(bubble_border_->GetInsets());

[dewittj, 2013/07/02 18:43:32]

Why are you changing bubble_frame_view?

[sidharthms, 2013/07/02 21:01:16]

Done. This was not meant to be part of the change.

   return client_bounds;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return const_cast<BubbleFrameView*>(this)->GetUpdatedWindowBounds(
       gfx::Rect(), client_bounds.size(), false);
 }
 
 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
@@ skipping 10 matching lines @@
       return HTSYSMENU;
     if (point.y() < title_->bounds().bottom())
       return HTCAPTION;
   }
 
   return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
-  if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
+  if (bubble_border_ &&
+      bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
     return;
 
   // Use a window mask roughly matching the border in the image assets.
   static const int kBorderStrokeSize = 1;
   static const SkScalar kCornerRadius = SkIntToScalar(6);
   gfx::Insets border_insets = bubble_border_->GetInsets();
   const SkRect rect = { SkIntToScalar(border_insets.left() - kBorderStrokeSize),
                         SkIntToScalar(border_insets.top() - kBorderStrokeSize),
                         SkIntToScalar(size.width() - border_insets.right() +
                                       kBorderStrokeSize),
@@ skipping 27 matching lines @@
   if (close_->visible())
     title_bar_width += close_->width() + 1;
   if (titlebar_extra_view_ != NULL)
     title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
   size.SetToMax(gfx::Size(title_bar_width, 0));
   return size;
 }
 
 void BubbleFrameView::Layout() {
   gfx::Rect bounds(GetLocalBounds());
-  bounds.Inset(border()->GetInsets());
+  if (border())
+    bounds.Inset(border()->GetInsets());
   // Small additional insets yield the desired 10px visual close button insets.
   bounds.Inset(0, 0, close_->width() + 1, 0);
   close_->SetPosition(gfx::Point(bounds.right(), bounds.y() + 2));
 
   gfx::Rect title_bounds(bounds);
   title_bounds.Inset(kTitleLeftInset, kTitleTopInset, 0, 0);
   gfx::Size title_size(title_->GetPreferredSize());
   const int title_width = std::max(0, close_->bounds().x() - title_bounds.x());
   title_size.SetToMin(gfx::Size(title_width, title_size.height()));
   title_bounds.set_size(title_size);
@@ skipping 138 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views