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

Unified Diff: ash/wm/window_positioner_unittest.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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: ash/wm/window_positioner_unittest.cc
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc
index ed3352b0619c46f7741ccfcbc56705099b255897..2ecdf04bf82d816ce7d00d5d6d9e0c020d233083 100644
--- a/ash/wm/window_positioner_unittest.cc
+++ b/ash/wm/window_positioner_unittest.cc
@@ -9,12 +9,12 @@
#include "ash/scoped_root_window_for_new_windows.h"
#include "ash/shell.h"
#include "ash/shell/toplevel_window.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/window_positioner.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/strings/string_number_conversions.h"
#include "ui/display/screen.h"
@@ -30,7 +30,7 @@ TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
// a new window gets maximized.
UpdateDisplay("400x400,500x500");
ScopedRootWindowForNewWindows root_for_new_windows(
- WmShell::Get()->GetAllRootWindows()[1]);
+ ShellPort::Get()->GetAllRootWindows()[1]);
shell::ToplevelWindow::CreateParams params;
params.can_resize = true;
params.can_maximize = true;
@@ -41,7 +41,7 @@ TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
TEST_F(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
UpdateDisplay("400x400,1400x900");
- WmWindow* second_root_window = WmShell::Get()->GetAllRootWindows()[1];
+ WmWindow* second_root_window = ShellPort::Get()->GetAllRootWindows()[1];
ScopedRootWindowForNewWindows root_for_new_windows(second_root_window);
shell::ToplevelWindow::CreateParams params;
params.can_resize = true;

Powered by Google App Engine
This is Rietveld 408576698