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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_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: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index 36afe3ec6d5052134f793a9c40a0318bc675f8cf..750ba02d522a7f19ab30bc148bfa6f9707b5665f 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -4,12 +4,12 @@
#include "ash/scoped_root_window_for_new_windows.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_positioner.h"
#include "ash/wm/window_resizer.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/memory/ptr_util.h"
#include "build/build_config.h"
@@ -824,7 +824,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
UpdateDisplay("500x500,600x600");
// By default windows are placed on the primary display.
- ash::WmWindow* first_root = ash::WmShell::Get()->GetAllRootWindows()[0];
+ ash::WmWindow* first_root = ash::ShellPort::Get()->GetAllRootWindows()[0];
EXPECT_EQ(first_root, ash::Shell::GetWmRootWindowForNewWindows());
gfx::Rect bounds;
ui::WindowShowState show_state;
@@ -834,7 +834,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
{
// When the second display is active new windows are placed there.
- ash::WmWindow* second_root = ash::WmShell::Get()->GetAllRootWindows()[1];
+ ash::WmWindow* second_root = ash::ShellPort::Get()->GetAllRootWindows()[1];
ash::ScopedRootWindowForNewWindows tmp(second_root);
gfx::Rect bounds;
ui::WindowShowState show_state;

Powered by Google App Engine
This is Rietveld 408576698