| 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/common/frame/custom_frame_view_ash.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/common/ash_layout_constants.h" | 9 #include "ash/common/ash_layout_constants.h" |
| 10 #include "ash/common/frame/caption_buttons/frame_caption_button.h" | 10 #include "ash/common/frame/caption_buttons/frame_caption_button.h" |
| 11 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h
" | 11 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h
" |
| 12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "ash/shell.h" | |
| 15 #include "ash/test/ash_test_base.h" | 14 #include "ash/test/ash_test_base.h" |
| 16 #include "ash/test/test_session_state_delegate.h" | 15 #include "ash/test/test_session_state_delegate.h" |
| 17 #include "grit/ash_resources.h" | 16 #include "grit/ash_resources.h" |
| 18 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
| 19 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 20 #include "ui/gfx/image/image_skia.h" | 19 #include "ui/gfx/image/image_skia.h" |
| 21 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 22 #include "ui/views/widget/widget_delegate.h" | 21 #include "ui/views/widget/widget_delegate.h" |
| 23 | 22 |
| 24 namespace ash { | 23 namespace ash { |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); | 214 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); |
| 216 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( | 215 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( |
| 217 false); | 216 false); |
| 218 delegate->EndFrameCaptionButtonContainerViewAnimations(); | 217 delegate->EndFrameCaptionButtonContainerViewAnimations(); |
| 219 const gfx::Rect after_restore = | 218 const gfx::Rect after_restore = |
| 220 delegate->GetFrameCaptionButtonContainerViewBounds(); | 219 delegate->GetFrameCaptionButtonContainerViewBounds(); |
| 221 EXPECT_EQ(initial, after_restore); | 220 EXPECT_EQ(initial, after_restore); |
| 222 } | 221 } |
| 223 | 222 |
| 224 } // namespace ash | 223 } // namespace ash |
| OLD | NEW |