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

Unified Diff: ash/wm/panels/panel_layout_manager_unittest.cc

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/screen_pinning_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 a917efd5d697c4d66e7f09f76baa5c4407908a9b..3ea0f31e536ce9341f10642f3258a1c640f8f45a 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -11,6 +11,7 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
#include "ash/screen_util.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_button.h"
@@ -733,7 +734,7 @@ TEST_F(PanelLayoutManagerTest, PanelsHideAndRestoreWithShelf) {
// While in full-screen mode, the panel windows should still be in the
// switchable window list - http://crbug.com/313919.
aura::Window::Windows switchable_window_list = WmWindowAura::ToAuraWindows(
- Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+ WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(3u, switchable_window_list.size());
EXPECT_NE(switchable_window_list.end(),
std::find(switchable_window_list.begin(),
« no previous file with comments | « ash/wm/mru_window_tracker_unittest.cc ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698