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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_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
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 5a1ccc5a11f1641c7810a6fb10b0dfacc496e6a1..1a5f4c0fd0bf84657c66c14304add51cc0cac946 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
@@ -1495,8 +1496,8 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {
activation_client->ActivateWindow(window(0));
EXPECT_EQ(wm::GetActiveWindow(), window(0));
- ash::MruWindowTracker::WindowList mru_list =
- ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
+ aura::Window::Windows mru_list = ash::WmWindowAura::ToAuraWindows(
+ ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(mru_list[0], window(0));
EXPECT_EQ(mru_list[1], window(1));
EXPECT_EQ(mru_list[2], window(2));
@@ -1511,8 +1512,8 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {
EXPECT_EQ("S[A], S[A], S[A]", GetStatus());
EXPECT_EQ(wm::GetActiveWindow(), window(0));
- mru_list =
- ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
+ mru_list = ash::WmWindowAura::ToAuraWindows(
+ ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(mru_list[0], window(0));
EXPECT_EQ(mru_list[1], window(1));
EXPECT_EQ(mru_list[2], window(2));
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698