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/custom_frame_view_ash.h" | 5 #include "ash/frame/custom_frame_view_ash.h" |
6 | 6 |
7 #include "ash/frame/caption_buttons/frame_caption_button.h" | 7 #include "ash/frame/caption_buttons/frame_caption_button.h" |
8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
11 #include "ash/test/test_session_state_delegate.h" | 11 #include "ash/test/test_session_state_delegate.h" |
12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "grit/ash_resources.h" | 14 #include "grit/ash_resources.h" |
15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 16 #include "ui/gfx/geometry/rect.h" |
16 #include "ui/gfx/image/image_skia.h" | 17 #include "ui/gfx/image/image_skia.h" |
17 #include "ui/gfx/rect.h" | |
18 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
19 #include "ui/views/widget/widget_delegate.h" | 19 #include "ui/views/widget/widget_delegate.h" |
20 | 20 |
21 namespace ash { | 21 namespace ash { |
22 | 22 |
23 // A views::WidgetDelegate which uses a CustomFrameViewAsh. | 23 // A views::WidgetDelegate which uses a CustomFrameViewAsh. |
24 class TestWidgetDelegate : public views::WidgetDelegateView { | 24 class TestWidgetDelegate : public views::WidgetDelegateView { |
25 public: | 25 public: |
26 TestWidgetDelegate() {} | 26 TestWidgetDelegate() {} |
27 ~TestWidgetDelegate() override {} | 27 ~TestWidgetDelegate() override {} |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); | 220 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); |
221 Shell::GetInstance()->maximize_mode_controller()-> | 221 Shell::GetInstance()->maximize_mode_controller()-> |
222 EnableMaximizeModeWindowManager(false); | 222 EnableMaximizeModeWindowManager(false); |
223 delegate->EndFrameCaptionButtonContainerViewAnimations(); | 223 delegate->EndFrameCaptionButtonContainerViewAnimations(); |
224 const gfx::Rect after_restore = delegate-> | 224 const gfx::Rect after_restore = delegate-> |
225 GetFrameCaptionButtonContainerViewBounds(); | 225 GetFrameCaptionButtonContainerViewBounds(); |
226 EXPECT_EQ(initial, after_restore); | 226 EXPECT_EQ(initial, after_restore); |
227 } | 227 } |
228 | 228 |
229 } // namespace ash | 229 } // namespace ash |
OLD | NEW |