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

Side by Side Diff: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

Issue 786513003: Cleaning up MruWindowTracker::BuildWindowList() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/wm/maximize_mode/maximize_mode_window_manager.h" 5 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/screen_util.h" 10 #include "ash/screen_util.h"
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 scoped_ptr<aura::Window> w1( 672 scoped_ptr<aura::Window> w1(
673 CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); 673 CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
674 scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); 674 scoped_ptr<aura::Window> w2(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
675 scoped_ptr<aura::Window> w3(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); 675 scoped_ptr<aura::Window> w3(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
676 scoped_ptr<aura::Window> w4( 676 scoped_ptr<aura::Window> w4(
677 CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); 677 CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
678 scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect)); 678 scoped_ptr<aura::Window> w5(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
679 679
680 // The windows should be in the reverse order of creation in the MRU list. 680 // The windows should be in the reverse order of creation in the MRU list.
681 { 681 {
682 MruWindowTracker::WindowList windows = 682 MruWindowTracker::WindowList windows = MruWindowTracker::BuildWindowList();
683 MruWindowTracker::BuildWindowList(false);
684 EXPECT_EQ(w1.get(), windows[4]); 683 EXPECT_EQ(w1.get(), windows[4]);
685 EXPECT_EQ(w2.get(), windows[3]); 684 EXPECT_EQ(w2.get(), windows[3]);
686 EXPECT_EQ(w3.get(), windows[2]); 685 EXPECT_EQ(w3.get(), windows[2]);
687 EXPECT_EQ(w4.get(), windows[1]); 686 EXPECT_EQ(w4.get(), windows[1]);
688 EXPECT_EQ(w5.get(), windows[0]); 687 EXPECT_EQ(w5.get(), windows[0]);
689 } 688 }
690 689
691 // Activating the window manager should keep the order. 690 // Activating the window manager should keep the order.
692 ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager(); 691 ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
693 ASSERT_TRUE(manager); 692 ASSERT_TRUE(manager);
694 EXPECT_EQ(5, manager->GetNumberOfManagedWindows()); 693 EXPECT_EQ(5, manager->GetNumberOfManagedWindows());
695 { 694 {
696 MruWindowTracker::WindowList windows = 695 MruWindowTracker::WindowList windows = MruWindowTracker::BuildWindowList();
697 MruWindowTracker::BuildWindowList(false);
698 // We do not test maximization here again since that was done already. 696 // We do not test maximization here again since that was done already.
699 EXPECT_EQ(w1.get(), windows[4]); 697 EXPECT_EQ(w1.get(), windows[4]);
700 EXPECT_EQ(w2.get(), windows[3]); 698 EXPECT_EQ(w2.get(), windows[3]);
701 EXPECT_EQ(w3.get(), windows[2]); 699 EXPECT_EQ(w3.get(), windows[2]);
702 EXPECT_EQ(w4.get(), windows[1]); 700 EXPECT_EQ(w4.get(), windows[1]);
703 EXPECT_EQ(w5.get(), windows[0]); 701 EXPECT_EQ(w5.get(), windows[0]);
704 } 702 }
705 703
706 // Destroying should still keep the order. 704 // Destroying should still keep the order.
707 DestroyMaximizeModeWindowManager(); 705 DestroyMaximizeModeWindowManager();
708 { 706 {
709 MruWindowTracker::WindowList windows = 707 MruWindowTracker::WindowList windows = MruWindowTracker::BuildWindowList();
710 MruWindowTracker::BuildWindowList(false);
711 // We do not test maximization here again since that was done already. 708 // We do not test maximization here again since that was done already.
712 EXPECT_EQ(w1.get(), windows[4]); 709 EXPECT_EQ(w1.get(), windows[4]);
713 EXPECT_EQ(w2.get(), windows[3]); 710 EXPECT_EQ(w2.get(), windows[3]);
714 EXPECT_EQ(w3.get(), windows[2]); 711 EXPECT_EQ(w3.get(), windows[2]);
715 EXPECT_EQ(w4.get(), windows[1]); 712 EXPECT_EQ(w4.get(), windows[1]);
716 EXPECT_EQ(w5.get(), windows[0]); 713 EXPECT_EQ(w5.get(), windows[0]);
717 } 714 }
718 } 715 }
719 716
720 // Check that a restore state change does always restore to maximized. 717 // Check that a restore state change does always restore to maximized.
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 // The window should still be full screen and immersive. 1223 // The window should still be full screen and immersive.
1227 EXPECT_TRUE(window_state->IsFullscreen()); 1224 EXPECT_TRUE(window_state->IsFullscreen());
1228 EXPECT_TRUE(window_state->in_immersive_fullscreen()); 1225 EXPECT_TRUE(window_state->in_immersive_fullscreen());
1229 1226
1230 DestroyMaximizeModeWindowManager(); 1227 DestroyMaximizeModeWindowManager();
1231 } 1228 }
1232 1229
1233 #endif // OS_WIN 1230 #endif // OS_WIN
1234 1231
1235 } // namespace ash 1232 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698