Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: ash/frame/custom_frame_view_ash_unittest.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory> 7 #include <memory>
8 8
9 #include "ash/ash_layout_constants.h" 9 #include "ash/ash_layout_constants.h"
10 #include "ash/frame/caption_buttons/frame_caption_button.h" 10 #include "ash/frame/caption_buttons/frame_caption_button.h"
11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/shell_port.h" 13 #include "ash/shell_port.h"
14 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
15 #include "ash/test/test_session_state_delegate.h" 15 #include "ash/test/test_session_state_delegate.h"
16 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 16 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
17 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
18 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
19 #include "ui/gfx/image/image_unittest_util.h" 19 #include "ui/gfx/image/image_unittest_util.h"
20 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
21 #include "ui/views/widget/widget_delegate.h" 21 #include "ui/views/widget/widget_delegate.h"
22 22
23 namespace ash { 23 namespace ash {
24 24
25 // A views::WidgetDelegate which uses a CustomFrameViewAsh. 25 // A views::WidgetDelegate which uses a CustomFrameViewAsh.
26 class TestWidgetDelegate : public views::WidgetDelegateView { 26 class TestWidgetDelegate : public views::WidgetDelegateView {
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 EXPECT_TRUE(custom_frame_view->GetAvatarIconViewForTest()); 195 EXPECT_TRUE(custom_frame_view->GetAvatarIconViewForTest());
196 196
197 // Avatar image is gone; the ImageView for the avatar icon should be 197 // Avatar image is gone; the ImageView for the avatar icon should be
198 // removed. 198 // removed.
199 GetTestSessionStateDelegate()->SetUserImage(gfx::ImageSkia()); 199 GetTestSessionStateDelegate()->SetUserImage(gfx::ImageSkia());
200 widget->Hide(); 200 widget->Hide();
201 widget->Show(); 201 widget->Show();
202 EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest()); 202 EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest());
203 } 203 }
204 204
205 // The visibility of the size button is updated when maximize mode is toggled. 205 // The visibility of the size button is updated when tablet mode is toggled.
206 // Verify that the layout of the HeaderView is updated for the size button's 206 // Verify that the layout of the HeaderView is updated for the size button's
207 // new visibility. 207 // new visibility.
208 TEST_F(CustomFrameViewAshTest, HeaderViewNotifiedOfChildSizeChange) { 208 TEST_F(CustomFrameViewAshTest, HeaderViewNotifiedOfChildSizeChange) {
209 TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate; 209 TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate;
210 std::unique_ptr<views::Widget> widget(CreateWidget(delegate)); 210 std::unique_ptr<views::Widget> widget(CreateWidget(delegate));
211 211
212 const gfx::Rect initial = 212 const gfx::Rect initial =
213 delegate->GetFrameCaptionButtonContainerViewBounds(); 213 delegate->GetFrameCaptionButtonContainerViewBounds();
214 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( 214 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
215 true);
216 delegate->EndFrameCaptionButtonContainerViewAnimations(); 215 delegate->EndFrameCaptionButtonContainerViewAnimations();
217 const gfx::Rect maximize_mode_bounds = 216 const gfx::Rect tablet_mode_bounds =
218 delegate->GetFrameCaptionButtonContainerViewBounds(); 217 delegate->GetFrameCaptionButtonContainerViewBounds();
219 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); 218 EXPECT_GT(initial.width(), tablet_mode_bounds.width());
220 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( 219 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
221 false);
222 delegate->EndFrameCaptionButtonContainerViewAnimations(); 220 delegate->EndFrameCaptionButtonContainerViewAnimations();
223 const gfx::Rect after_restore = 221 const gfx::Rect after_restore =
224 delegate->GetFrameCaptionButtonContainerViewBounds(); 222 delegate->GetFrameCaptionButtonContainerViewBounds();
225 EXPECT_EQ(initial, after_restore); 223 EXPECT_EQ(initial, after_restore);
226 } 224 }
227 225
228 } // namespace ash 226 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698