| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/frame/default_header_painter.h" | 5 #include "ash/frame/default_header_painter.h" |
| 6 | 6 |
| 7 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 7 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "grit/ash_resources.h" | |
| 13 #include "ui/gfx/font_list.h" | 12 #include "ui/gfx/font_list.h" |
| 14 #include "ui/views/test/test_views.h" | 13 #include "ui/views/test/test_views.h" |
| 15 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 16 #include "ui/views/window/non_client_view.h" | 15 #include "ui/views/window/non_client_view.h" |
| 17 | 16 |
| 18 using ash::HeaderPainter; | 17 using ash::HeaderPainter; |
| 19 using views::NonClientFrameView; | 18 using views::NonClientFrameView; |
| 20 using views::Widget; | 19 using views::Widget; |
| 21 | 20 |
| 22 namespace ash { | 21 namespace ash { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 49 w->non_client_view()->frame_view(), | 48 w->non_client_view()->frame_view(), |
| 50 &container); | 49 &container); |
| 51 painter.UpdateLeftHeaderView(&window_icon); | 50 painter.UpdateLeftHeaderView(&window_icon); |
| 52 painter.LayoutHeader(); | 51 painter.LayoutHeader(); |
| 53 gfx::Rect title_bounds = painter.GetTitleBounds(); | 52 gfx::Rect title_bounds = painter.GetTitleBounds(); |
| 54 EXPECT_EQ(window_icon.bounds().CenterPoint().y(), | 53 EXPECT_EQ(window_icon.bounds().CenterPoint().y(), |
| 55 title_bounds.CenterPoint().y()); | 54 title_bounds.CenterPoint().y()); |
| 56 } | 55 } |
| 57 | 56 |
| 58 } // namespace ash | 57 } // namespace ash |
| OLD | NEW |