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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« ash/wm/lock_layout_manager.h ('K') | « ash/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/wm/maximize_mode/maximize_mode_window_state.h » ('j') | ash/wm/maximize_mode/maximize_mode_window_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
index 2d62e1271292601acd84c34a27966afc8fc33818..67deb94c2adbe8bf4605f7de66e74db42496ebf3 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -160,15 +160,22 @@ TEST_F(MaximizeModeWindowManagerTest, PreCreateWindows) {
gfx::Rect rect3(20, 140, 100, 100);
// Bounds for anything else.
gfx::Rect rect(80, 90, 100, 110);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
- scoped_ptr<aura::Window> w3(
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
+ std::unique_ptr<aura::Window> w2(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
+ std::unique_ptr<aura::Window> w3(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect3));
- scoped_ptr<aura::Window> w4(CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
- scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
- scoped_ptr<aura::Window> w6(CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
- scoped_ptr<aura::Window> w7(CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
- scoped_ptr<aura::Window> w8(CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
+ std::unique_ptr<aura::Window> w4(
+ CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
+ std::unique_ptr<aura::Window> w5(
+ CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
+ std::unique_ptr<aura::Window> w6(
+ CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
+ std::unique_ptr<aura::Window> w7(
+ CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
+ std::unique_ptr<aura::Window> w8(
+ CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
EXPECT_FALSE(wm::GetWindowState(w1.get())->IsMaximized());
EXPECT_FALSE(wm::GetWindowState(w2.get())->IsMaximized());
EXPECT_FALSE(wm::GetWindowState(w3.get())->IsMaximized());
@@ -223,15 +230,22 @@ TEST_F(MaximizeModeWindowManagerTest, GoingToMaximizedWithModalDialogPresent) {
gfx::Rect rect3(20, 140, 100, 100);
// Bounds for anything else.
gfx::Rect rect(80, 90, 100, 110);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
- scoped_ptr<aura::Window> w3(
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
+ std::unique_ptr<aura::Window> w2(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
+ std::unique_ptr<aura::Window> w3(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect3));
- scoped_ptr<aura::Window> w4(CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
- scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
- scoped_ptr<aura::Window> w6(CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
- scoped_ptr<aura::Window> w7(CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
- scoped_ptr<aura::Window> w8(CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
+ std::unique_ptr<aura::Window> w4(
+ CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
+ std::unique_ptr<aura::Window> w5(
+ CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
+ std::unique_ptr<aura::Window> w6(
+ CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
+ std::unique_ptr<aura::Window> w7(
+ CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
+ std::unique_ptr<aura::Window> w8(
+ CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
EXPECT_FALSE(wm::GetWindowState(w1.get())->IsMaximized());
EXPECT_FALSE(wm::GetWindowState(w2.get())->IsMaximized());
EXPECT_FALSE(wm::GetWindowState(w3.get())->IsMaximized());
@@ -290,11 +304,11 @@ TEST_F(MaximizeModeWindowManagerTest,
gfx::Rect rect(10, 10, 200, 50);
gfx::Size max_size(300, 200);
gfx::Size empty_size;
- scoped_ptr<aura::Window> unlimited_window(
+ std::unique_ptr<aura::Window> unlimited_window(
CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect, empty_size));
- scoped_ptr<aura::Window> limited_window(
+ std::unique_ptr<aura::Window> limited_window(
CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect, max_size));
- scoped_ptr<aura::Window> fixed_window(
+ std::unique_ptr<aura::Window> fixed_window(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
EXPECT_FALSE(wm::GetWindowState(unlimited_window.get())->IsMaximized());
EXPECT_EQ(rect.ToString(), unlimited_window->bounds().ToString());
@@ -353,15 +367,22 @@ TEST_F(MaximizeModeWindowManagerTest, CreateWindows) {
gfx::Rect rect3(20, 140, 100, 100);
// One rect for anything else.
gfx::Rect rect(80, 90, 100, 110);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
- scoped_ptr<aura::Window> w3(
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
+ std::unique_ptr<aura::Window> w2(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
+ std::unique_ptr<aura::Window> w3(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect3));
- scoped_ptr<aura::Window> w4(CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
- scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
- scoped_ptr<aura::Window> w6(CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
- scoped_ptr<aura::Window> w7(CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
- scoped_ptr<aura::Window> w8(CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
+ std::unique_ptr<aura::Window> w4(
+ CreateWindow(ui::wm::WINDOW_TYPE_PANEL, rect));
+ std::unique_ptr<aura::Window> w5(
+ CreateWindow(ui::wm::WINDOW_TYPE_POPUP, rect));
+ std::unique_ptr<aura::Window> w6(
+ CreateWindow(ui::wm::WINDOW_TYPE_CONTROL, rect));
+ std::unique_ptr<aura::Window> w7(
+ CreateWindow(ui::wm::WINDOW_TYPE_MENU, rect));
+ std::unique_ptr<aura::Window> w8(
+ CreateWindow(ui::wm::WINDOW_TYPE_TOOLTIP, rect));
EXPECT_TRUE(wm::GetWindowState(w1.get())->IsMaximized());
EXPECT_TRUE(wm::GetWindowState(w2.get())->IsMaximized());
EXPECT_EQ(3, manager->GetNumberOfManagedWindows());
@@ -416,8 +437,8 @@ TEST_F(MaximizeModeWindowManagerTest,
// We pass in an empty rectangle to simulate a window creation with no
// particular size.
gfx::Rect empty_rect(0, 0, 0, 0);
- scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
- empty_rect));
+ std::unique_ptr<aura::Window> window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, empty_rect));
EXPECT_TRUE(wm::GetWindowState(window.get())->IsMaximized());
EXPECT_NE(empty_rect.ToString(), window->bounds().ToString());
gfx::Rect maximized_size = window->bounds();
@@ -442,11 +463,11 @@ TEST_F(MaximizeModeWindowManagerTest,
gfx::Rect rect(10, 10, 200, 50);
gfx::Size max_size(300, 200);
gfx::Size empty_size;
- scoped_ptr<aura::Window> unlimited_window(
+ std::unique_ptr<aura::Window> unlimited_window(
CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect, empty_size));
- scoped_ptr<aura::Window> limited_window(
+ std::unique_ptr<aura::Window> limited_window(
CreateNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect, max_size));
- scoped_ptr<aura::Window> fixed_window(
+ std::unique_ptr<aura::Window> fixed_window(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
gfx::Size workspace_size = ScreenUtil::GetMaximizedWindowBoundsInParent(
@@ -509,9 +530,8 @@ TEST_F(MaximizeModeWindowManagerTest, TestRestoreIntegrety) {
gfx::Rect bounds(10, 10, 200, 50);
gfx::Size empty_size;
gfx::Rect empty_bounds;
- scoped_ptr<aura::Window> normal_window(
- CreateWindowWithWidget(bounds));
- scoped_ptr<aura::Window> maximized_window(
+ std::unique_ptr<aura::Window> normal_window(CreateWindowWithWidget(bounds));
+ std::unique_ptr<aura::Window> maximized_window(
CreateWindowWithWidget(bounds));
wm::GetWindowState(maximized_window.get())->Maximize();
@@ -557,11 +577,11 @@ TEST_F(MaximizeModeWindowManagerTest, PreCreateWindowsDeleteWhileActive) {
gfx::Rect rect3(20, 140, 100, 100);
// Bounds for anything else.
gfx::Rect rect(80, 90, 100, 110);
- scoped_ptr<aura::Window> w1(
+ std::unique_ptr<aura::Window> w1(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(
+ std::unique_ptr<aura::Window> w2(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
- scoped_ptr<aura::Window> w3(
+ std::unique_ptr<aura::Window> w3(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect3));
// Create the manager and make sure that all qualifying windows were
@@ -585,13 +605,12 @@ TEST_F(MaximizeModeWindowManagerTest, CreateWindowsAndDeleteWhileActive) {
gfx::Rect rect1(10, 10, 200, 50);
gfx::Rect rect2(10, 60, 200, 50);
gfx::Rect rect3(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(
+ std::unique_ptr<aura::Window> w1(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(10, 10, 200, 50)));
- scoped_ptr<aura::Window> w2(
+ std::unique_ptr<aura::Window> w2(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(10, 60, 200, 50)));
- scoped_ptr<aura::Window> w3(
- CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL,
- gfx::Rect(20, 140, 100, 100)));
+ std::unique_ptr<aura::Window> w3(CreateFixedSizeNonMaximizableWindow(
+ ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(20, 140, 100, 100)));
// Check that the windows got automatically maximized as well.
EXPECT_EQ(3, manager->GetNumberOfManagedWindows());
EXPECT_TRUE(wm::GetWindowState(w1.get())->IsMaximized());
@@ -606,7 +625,7 @@ TEST_F(MaximizeModeWindowManagerTest, CreateWindowsAndDeleteWhileActive) {
TEST_F(MaximizeModeWindowManagerTest, MaximizedShouldRemainMaximized) {
// Bounds for windows we know can be controlled.
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::GetWindowState(window.get())->Maximize();
@@ -629,11 +648,11 @@ TEST_F(MaximizeModeWindowManagerTest, MaximizedShouldRemainMaximized) {
TEST_F(MaximizeModeWindowManagerTest, MinimizedWindowBehavior) {
// Bounds for windows we know can be controlled.
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window> initially_minimized_window(
+ std::unique_ptr<aura::Window> initially_minimized_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> initially_normal_window(
+ std::unique_ptr<aura::Window> initially_normal_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> initially_maximized_window(
+ std::unique_ptr<aura::Window> initially_maximized_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::GetWindowState(initially_minimized_window.get())->Minimize();
wm::GetWindowState(initially_maximized_window.get())->Maximize();
@@ -674,13 +693,13 @@ TEST_F(MaximizeModeWindowManagerTest, DesktopSizeChangeMovesUnmaximizable) {
UpdateDisplay("400x400");
// This window will move because it does not fit the new bounds.
gfx::Rect rect(20, 300, 100, 100);
- scoped_ptr<aura::Window> window1(
+ std::unique_ptr<aura::Window> window1(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
EXPECT_EQ(rect.ToString(), window1->bounds().ToString());
// This window will not move because it does fit the new bounds.
gfx::Rect rect2(20, 140, 100, 100);
- scoped_ptr<aura::Window> window2(
+ std::unique_ptr<aura::Window> window2(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
// Turning on the manager will reposition (but not resize) the window.
@@ -709,7 +728,7 @@ TEST_F(MaximizeModeWindowManagerTest, DesktopSizeChangeMovesUnmaximizable) {
// something else and back while in maximize mode.
TEST_F(MaximizeModeWindowManagerTest, SizeChangeReturnWindowToOriginalPos) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
// Turning on the manager will reposition (but not resize) the window.
@@ -738,13 +757,16 @@ TEST_F(MaximizeModeWindowManagerTest, SizeChangeReturnWindowToOriginalPos) {
// order of windows.
TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(
+ std::unique_ptr<aura::Window> w1(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> w3(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> w4(
+ std::unique_ptr<aura::Window> w2(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w3(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w4(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w5(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
// The windows should be in the reverse order of creation in the MRU list.
{
@@ -789,7 +811,8 @@ TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) {
// Check that a restore state change does always restore to maximized.
TEST_F(MaximizeModeWindowManagerTest, IgnoreRestoreStateChages) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
CreateMaximizeModeWindowManager();
EXPECT_TRUE(window_state->IsMaximized());
@@ -805,8 +828,8 @@ TEST_F(MaximizeModeWindowManagerTest, IgnoreRestoreStateChages) {
// Check that minimize and restore do the right thing.
TEST_F(MaximizeModeWindowManagerTest, TestMinimize) {
gfx::Rect rect(10, 10, 100, 100);
- scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
- rect));
+ std::unique_ptr<aura::Window> window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(window.get());
EXPECT_EQ(rect.ToString(), window->bounds().ToString());
ash::Shell::GetInstance()->maximize_mode_controller()->
@@ -837,7 +860,8 @@ TEST_F(MaximizeModeWindowManagerTest, TestMinimize) {
// maximize mode if it was un-full-screened while in maximize mode.
TEST_F(MaximizeModeWindowManagerTest, KeepFullScreenModeOn) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
ShelfLayoutManager* shelf =
@@ -882,7 +906,8 @@ TEST_F(MaximizeModeWindowManagerTest, KeepFullScreenModeOn) {
// preserved upon exiting maximize mode.
TEST_F(MaximizeModeWindowManagerTest, MinimizePreservedAfterLeavingFullscreen) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
ShelfLayoutManager* shelf =
@@ -909,7 +934,8 @@ TEST_F(MaximizeModeWindowManagerTest, MinimizePreservedAfterLeavingFullscreen) {
// upon coming back.
TEST_F(MaximizeModeWindowManagerTest, AllowFullScreenMode) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
ShelfLayoutManager* shelf =
@@ -951,7 +977,8 @@ TEST_F(MaximizeModeWindowManagerTest,
CreateMaximizeModeWindowManager();
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
wm::WMEvent event_full_screen(wm::WM_EVENT_TOGGLE_FULLSCREEN);
window_state->OnWMEvent(&event_full_screen);
@@ -967,7 +994,8 @@ TEST_F(MaximizeModeWindowManagerTest,
TEST_F(MaximizeModeWindowManagerTest,
FullScreenModeRemainsThroughMaximizeModeSwitch) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
wm::WMEvent event_full_screen(wm::WM_EVENT_TOGGLE_FULLSCREEN);
window_state->OnWMEvent(&event_full_screen);
@@ -984,7 +1012,8 @@ TEST_F(MaximizeModeWindowManagerTest,
CreateAndMaximizeInMaximizeModeShouldRetoreToGoodSizeGoingToDefault) {
CreateMaximizeModeWindowManager();
gfx::Rect rect;
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
w1->Show();
wm::WindowState* window_state = wm::GetWindowState(w1.get());
EXPECT_TRUE(window_state->IsMaximized());
@@ -1012,7 +1041,8 @@ TEST_F(MaximizeModeWindowManagerTest,
// Check that snapping operations get ignored.
TEST_F(MaximizeModeWindowManagerTest, SnapModeTests) {
gfx::Rect rect(20, 140, 100, 100);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* window_state = wm::GetWindowState(w1.get());
wm::WMEvent event_left(wm::WM_EVENT_SNAP_LEFT);
wm::WMEvent event_right(wm::WM_EVENT_SNAP_RIGHT);
@@ -1039,7 +1069,7 @@ TEST_F(MaximizeModeWindowManagerTest, SnapModeTests) {
// Check that non maximizable windows cannot be dragged by the user.
TEST_F(MaximizeModeWindowManagerTest, TryToDesktopSizeDragUnmaximizable) {
gfx::Rect rect(10, 10, 100, 100);
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
EXPECT_EQ(rect.ToString(), window->bounds().ToString());
@@ -1091,8 +1121,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitsOverview) {
// Bounds for windows we know can be controlled.
gfx::Rect rect1(10, 10, 200, 50);
gfx::Rect rect2(10, 60, 200, 50);
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
+ std::unique_ptr<aura::Window> w2(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
WindowSelectorController* window_selector_controller =
Shell::GetInstance()->window_selector_controller();
@@ -1113,10 +1145,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitsOverview) {
// Test that an edge swipe from the top will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromTop) {
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window>
- background_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window>
- foreground_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> background_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> foreground_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* background_window_state =
wm::GetWindowState(background_window.get());
wm::WindowState* foreground_window_state =
@@ -1157,10 +1189,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromTop) {
// Test that an edge swipe from the bottom will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromBottom) {
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window>
- background_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window>
- foreground_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> background_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> foreground_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* background_window_state =
wm::GetWindowState(background_window.get());
wm::WindowState* foreground_window_state =
@@ -1193,10 +1225,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromBottom) {
// Test that an edge touch press at the top will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtTop) {
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window>
- background_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window>
- foreground_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> background_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> foreground_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* background_window_state =
wm::GetWindowState(background_window.get());
wm::WindowState* foreground_window_state =
@@ -1229,10 +1261,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtTop) {
// Test that an edge touch press at the bottom will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtBottom) {
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window>
- background_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
- scoped_ptr<aura::Window>
- foreground_window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> background_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
+ std::unique_ptr<aura::Window> foreground_window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WindowState* background_window_state =
wm::GetWindowState(background_window.get());
wm::WindowState* foreground_window_state =
@@ -1267,8 +1299,8 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtBottom) {
// Test that an edge swipe from the top on an immersive mode window will not end
// full screen mode.
TEST_F(MaximizeModeWindowManagerTest, NoExitImmersiveModeWithEdgeSwipeFromTop) {
- scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
- gfx::Rect(10, 10, 200, 50)));
+ std::unique_ptr<aura::Window> window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(10, 10, 200, 50)));
wm::WindowState* window_state = wm::GetWindowState(window.get());
wm::ActivateWindow(window.get());
CreateMaximizeModeWindowManager();
@@ -1299,8 +1331,8 @@ TEST_F(MaximizeModeWindowManagerTest, NoExitImmersiveModeWithEdgeSwipeFromTop) {
// Test that an edge swipe from the bottom will not end immersive mode.
TEST_F(MaximizeModeWindowManagerTest,
NoExitImmersiveModeWithEdgeSwipeFromBottom) {
- scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
- gfx::Rect(10, 10, 200, 50)));
+ std::unique_ptr<aura::Window> window(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, gfx::Rect(10, 10, 200, 50)));
wm::WindowState* window_state = wm::GetWindowState(window.get());
wm::ActivateWindow(window.get());
CreateMaximizeModeWindowManager();
@@ -1337,8 +1369,9 @@ TEST_F(MaximizeModeWindowManagerTest, AlwaysOnTopWindows) {
gfx::Rect rect2(20, 140, 100, 100);
// Create two windows with the always-on-top property.
- scoped_ptr<aura::Window> w1(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
- scoped_ptr<aura::Window> w2(
+ std::unique_ptr<aura::Window> w1(
+ CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
+ std::unique_ptr<aura::Window> w2(
CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
w1->SetProperty(aura::client::kAlwaysOnTopKey, true);
w2->SetProperty(aura::client::kAlwaysOnTopKey, true);
@@ -1403,7 +1436,7 @@ TEST_F(MaximizeModeWindowManagerTest, AlwaysOnTopWindows) {
// Tests that docked windows are not maximized, and not tracked.
TEST_F(MaximizeModeWindowManagerTest, DontMaximizeDockedWindows) {
gfx::Rect rect(10, 10, 200, 50);
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
wm::WMEvent dock_event(wm::WM_EVENT_DOCK);
« ash/wm/lock_layout_manager.h ('K') | « ash/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/wm/maximize_mode/maximize_mode_window_state.h » ('j') | ash/wm/maximize_mode/maximize_mode_window_state.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698