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

Unified Diff: ash/wm/workspace/workspace_window_resizer_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/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 3e38ef68580d202aa18c7718a9526261d741c3ba..2e07f22097a8252fad5f2fb70375a07c5c61101f 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -9,6 +9,7 @@
#include "ash/shelf/shelf_constants.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_positioning_utils.h"
#include "ash/wm/window_state.h"
@@ -17,7 +18,6 @@
#include "ash/wm/wm_event.h"
#include "ash/wm/workspace/phantom_window_controller.h"
#include "ash/wm/workspace_controller.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
@@ -498,7 +498,7 @@ TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3_Compress) {
TEST_F(WorkspaceWindowResizerTest, MouseMoveWithTouchDrag) {
// TODO: fails because mash doesn't support CursorManager.
// http://crbug.com/631103.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
window_->SetBounds(gfx::Rect(0, 300, 400, 300));
@@ -802,7 +802,7 @@ TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) {
TEST_F(WorkspaceWindowResizerTest, DontDragOffBottomWithMultiDisplay) {
// TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
// http://crbug.com/698043.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
UpdateDisplay("800x600,800x600");

Powered by Google App Engine
This is Rietveld 408576698