| Index: ash/frame/custom_frame_view_ash_unittest.cc
|
| diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc
|
| index da4d73816d1db1548b19deb3ca09f3bb654b13dd..13b4b4726805b41abb0b824200d3205d9b9b55bc 100644
|
| --- a/ash/frame/custom_frame_view_ash_unittest.cc
|
| +++ b/ash/frame/custom_frame_view_ash_unittest.cc
|
| @@ -34,9 +34,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
|
| return custom_frame_view_;
|
| }
|
|
|
| - CustomFrameViewAsh* custom_frame_view() const {
|
| - return custom_frame_view_;
|
| - }
|
| + CustomFrameViewAsh* custom_frame_view() const { return custom_frame_view_; }
|
|
|
| private:
|
| // Not owned.
|
| @@ -66,22 +64,19 @@ class TestWidgetConstraintsDelegate : public TestWidgetDelegate {
|
|
|
| bool CanMinimize() const override { return true; }
|
|
|
| - void set_minimum_size(const gfx::Size& min_size) {
|
| - minimum_size_ = min_size;
|
| - }
|
| + void set_minimum_size(const gfx::Size& min_size) { minimum_size_ = min_size; }
|
|
|
| - void set_maximum_size(const gfx::Size& max_size) {
|
| - maximum_size_ = max_size;
|
| - }
|
| + void set_maximum_size(const gfx::Size& max_size) { maximum_size_ = max_size; }
|
|
|
| const gfx::Rect& GetFrameCaptionButtonContainerViewBounds() {
|
| - return custom_frame_view()->GetFrameCaptionButtonContainerViewForTest()->
|
| - bounds();
|
| + return custom_frame_view()
|
| + ->GetFrameCaptionButtonContainerViewForTest()
|
| + ->bounds();
|
| }
|
|
|
| void EndFrameCaptionButtonContainerViewAnimations() {
|
| - FrameCaptionButtonContainerView::TestApi test(custom_frame_view()->
|
| - GetFrameCaptionButtonContainerViewForTest());
|
| + FrameCaptionButtonContainerView::TestApi test(
|
| + custom_frame_view()->GetFrameCaptionButtonContainerViewForTest());
|
| test.EndAnimations();
|
| }
|
|
|
| @@ -209,19 +204,21 @@ TEST_F(CustomFrameViewAshTest, HeaderViewNotifiedOfChildSizeChange) {
|
| TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate;
|
| std::unique_ptr<views::Widget> widget(CreateWidget(delegate));
|
|
|
| - const gfx::Rect initial = delegate->
|
| - GetFrameCaptionButtonContainerViewBounds();
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(true);
|
| + const gfx::Rect initial =
|
| + delegate->GetFrameCaptionButtonContainerViewBounds();
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(true);
|
| delegate->EndFrameCaptionButtonContainerViewAnimations();
|
| - const gfx::Rect maximize_mode_bounds = delegate->
|
| - GetFrameCaptionButtonContainerViewBounds();
|
| + const gfx::Rect maximize_mode_bounds =
|
| + delegate->GetFrameCaptionButtonContainerViewBounds();
|
| EXPECT_GT(initial.width(), maximize_mode_bounds.width());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(false);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(false);
|
| delegate->EndFrameCaptionButtonContainerViewAnimations();
|
| - const gfx::Rect after_restore = delegate->
|
| - GetFrameCaptionButtonContainerViewBounds();
|
| + const gfx::Rect after_restore =
|
| + delegate->GetFrameCaptionButtonContainerViewBounds();
|
| EXPECT_EQ(initial, after_restore);
|
| }
|
|
|
|
|