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

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

Issue 2042913002: Converts MruWindowTracker to work with common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: not equal Created 4 years, 6 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
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/wm/mru_window_tracker.h » ('j') | no next file with comments »
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 f927bf23c43e8d2429424a3eba131fb7fa8ac7e8..f1c5cbefc96fda2fcdac882ca0b919d226b63331 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/switchable_windows.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
@@ -770,8 +771,9 @@ TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) {
// The windows should be in the reverse order of creation in the MRU list.
{
- MruWindowTracker::WindowList windows = ash::Shell::GetInstance()->
- mru_window_tracker()->BuildMruWindowList();
+ aura::Window::Windows windows = WmWindowAura::ToAuraWindows(
+ ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+
EXPECT_EQ(w1.get(), windows[4]);
EXPECT_EQ(w2.get(), windows[3]);
EXPECT_EQ(w3.get(), windows[2]);
@@ -784,8 +786,8 @@ TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) {
ASSERT_TRUE(manager);
EXPECT_EQ(5, manager->GetNumberOfManagedWindows());
{
- MruWindowTracker::WindowList windows = ash::Shell::GetInstance()->
- mru_window_tracker()->BuildMruWindowList();
+ aura::Window::Windows windows = WmWindowAura::ToAuraWindows(
+ ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
// We do not test maximization here again since that was done already.
EXPECT_EQ(w1.get(), windows[4]);
EXPECT_EQ(w2.get(), windows[3]);
@@ -797,8 +799,8 @@ TEST_F(MaximizeModeWindowManagerTest, ModeChangeKeepsMRUOrder) {
// Destroying should still keep the order.
DestroyMaximizeModeWindowManager();
{
- MruWindowTracker::WindowList windows = ash::Shell::GetInstance()->
- mru_window_tracker()->BuildMruWindowList();
+ aura::Window::Windows windows = WmWindowAura::ToAuraWindows(
+ ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
// We do not test maximization here again since that was done already.
EXPECT_EQ(w1.get(), windows[4]);
EXPECT_EQ(w2.get(), windows[3]);
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/wm/mru_window_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698