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

Unified Diff: ash/wm/panels/panel_layout_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/mru_window_tracker_unittest.cc ('k') | ash/wm/window_cycle_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 6bc78df9603c231d39de02d5b4db885c418950db..7f29683a02c5cc0d9419d2c5bf66dd0f77a782cc 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -739,18 +739,18 @@ TEST_F(PanelLayoutManagerTest, PanelsHideAndRestoreWithShelf) {
// While in full-screen mode, the panel windows should still be in the
// switchable window list - http://crbug.com/313919.
- MruWindowTracker::WindowList switchable_window_list =
- Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
+ aura::Window::Windows switchable_window_list = WmWindowAura::ToAuraWindows(
+ Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(3u, switchable_window_list.size());
EXPECT_NE(switchable_window_list.end(),
- std::find(switchable_window_list.begin(), switchable_window_list.end(),
- w1.get()));
+ std::find(switchable_window_list.begin(),
+ switchable_window_list.end(), w1.get()));
EXPECT_NE(switchable_window_list.end(),
- std::find(switchable_window_list.begin(), switchable_window_list.end(),
- w2.get()));
+ std::find(switchable_window_list.begin(),
+ switchable_window_list.end(), w2.get()));
EXPECT_NE(switchable_window_list.end(),
- std::find(switchable_window_list.begin(), switchable_window_list.end(),
- w3.get()));
+ std::find(switchable_window_list.begin(),
+ switchable_window_list.end(), w3.get()));
SetShelfVisibilityState(Shell::GetPrimaryRootWindow(), SHELF_VISIBLE);
RunAllPendingInMessageLoop();
« no previous file with comments | « ash/wm/mru_window_tracker_unittest.cc ('k') | ash/wm/window_cycle_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698