Fix position of web notification bubble and arrow

ui/views/bubble/bubble_frame_view_unittest.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/base/hit_test.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 39 matching lines @@
  protected:
   virtual gfx::Rect GetMonitorBounds(const gfx::Rect& rect) OVERRIDE;
 
  private:
   gfx::Rect monitor_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBubbleFrameView);
 };
 
 TestBubbleFrameView::TestBubbleFrameView(const gfx::Rect& bounds)
-  : BubbleFrameView(kArrow, kBackgroundColor,
-        gfx::Insets(kDefaultMargin,
-                    kDefaultMargin,
-                    kDefaultMargin,
-                    kDefaultMargin)),
+  : BubbleFrameView(gfx::Insets(kDefaultMargin,
+                                kDefaultMargin,
+                                kDefaultMargin,
+                                kDefaultMargin)),
     monitor_bounds_(bounds) {
+  BubbleBorder* bubble_border =
+      new BubbleBorder(kArrow, BubbleBorder::NO_SHADOW);
+  bubble_border->set_background_color(kBackgroundColor);
+  SetBubbleBorder(bubble_border);
 }
 
 TestBubbleFrameView::~TestBubbleFrameView() {}
 
 gfx::Rect TestBubbleFrameView::GetMonitorBounds(const gfx::Rect& rect) {
   return monitor_bounds_;
 }
 
 }  // namespace
 
 TEST_F(BubbleFrameViewTest, GetBoundsForClientView) {
-  BubbleFrameView frame(
-      kArrow,
-      kBackgroundColor,
-      gfx::Insets(kDefaultMargin, kDefaultMargin, kDefaultMargin,
-                  kDefaultMargin));
+  TestBubbleFrameView frame(gfx::Rect(0, 0, 1000, 1000));

[msw, 2012/07/23 22:20:49]

Why change the margins from kDefaultMargin?

[stevenjb, 2012/07/23 23:32:06]

TestBubbleFrameView sets the insets using kDefaultMargin. This rect is the
monitor bounds, unimportant in this test, copied from other TestBubbleFrameView
constructors. I'll replace the rect with something like kDefaultMonitorBounds.

[msw, 2012/07/24 00:32:44]

Ah, you're right, thanks.

   EXPECT_EQ(kArrow, frame.bubble_border()->arrow_location());
   EXPECT_EQ(kBackgroundColor, frame.bubble_border()->background_color());
 
   int margin_x = frame.content_margins().left();
   int margin_y = frame.content_margins().top();
   gfx::Insets insets;
   frame.bubble_border()->GetInsets(&insets);
   EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
   EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
 }
@@ skipping 144 matching lines @@
       gfx::Size(500, 500),          // |client_size|
       false);                       // |try_mirroring_arrow|
   EXPECT_EQ(BubbleBorder::TOP_RIGHT, frame.bubble_border()->arrow_location());
   // The coordinates should be pointing to anchor_rect from TOP_RIGHT.
   EXPECT_LT(window_bounds.x(), 100 + 50 - 500);
   EXPECT_GT(window_bounds.y(), 900 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 }
 
 }  // namespace views