| Index: ash/frame/default_header_painter_unittest.cc
|
| diff --git a/ash/frame/default_header_painter_unittest.cc b/ash/frame/default_header_painter_unittest.cc
|
| index 282baabb20c5c724eddcc22b4ebaa526f20e5a60..b5a28fd02834b3eb128308add66fb88cecdb7256 100644
|
| --- a/ash/frame/default_header_painter_unittest.cc
|
| +++ b/ash/frame/default_header_painter_unittest.cc
|
| @@ -5,12 +5,14 @@
|
| #include "ash/frame/default_header_painter.h"
|
|
|
| #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
|
| +#include "ash/frame/header_painter_util.h"
|
| #include "ash/shell.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/wm/window_state.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "grit/ash_resources.h"
|
| #include "ui/gfx/font_list.h"
|
| +#include "ui/views/test/test_views.h"
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/views/window/non_client_view.h"
|
|
|
| @@ -38,7 +40,7 @@ TEST_F(DefaultHeaderPainterTest, TitleIconAlignment) {
|
| scoped_ptr<Widget> w(CreateTestWidget());
|
| ash::FrameCaptionButtonContainerView container(w.get(),
|
| ash::FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
|
| - views::View window_icon;
|
| + views::StaticSizedView window_icon(gfx::Size(16, 16));
|
| window_icon.SetBounds(0, 0, 16, 16);
|
| w->SetBounds(gfx::Rect(0, 0, 500, 500));
|
| w->Show();
|
| @@ -46,8 +48,8 @@ TEST_F(DefaultHeaderPainterTest, TitleIconAlignment) {
|
| DefaultHeaderPainter painter;
|
| painter.Init(w.get(),
|
| w->non_client_view()->frame_view(),
|
| - &window_icon,
|
| &container);
|
| + painter.UpdateLeftHeaderView(&window_icon);
|
| painter.LayoutHeader();
|
| gfx::Rect title_bounds = painter.GetTitleBounds();
|
| EXPECT_EQ(window_icon.bounds().CenterPoint().y(),
|
|
|