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: ash/wm/workspace/workspace_event_handler_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_event_handler_unittest.cc
diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc
index aa24e730fca74782c2df1cea0847a1e8bff120ab..88e0f31b98b0be917a83ab944a89e0a0b5333f26 100644
--- a/ash/wm/workspace/workspace_event_handler_unittest.cc
+++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/screen_util.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
@@ -13,7 +14,6 @@
#include "ash/wm/wm_event.h"
#include "ash/wm/workspace_controller.h"
#include "ash/wm/workspace_controller_test_helper.h"
-#include "ash/wm_shell.h"
#include "base/threading/thread_task_runner_handle.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
@@ -97,7 +97,7 @@ class WindowPropertyObserver : public aura::WindowObserver {
TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisResizeEdge) {
// TODO: investigate failure. http://crbug.com/699175.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
// Double clicking the vertical resize edge of a window should maximize it
@@ -207,7 +207,7 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisResizeEdge) {
// Tests the behavior when double clicking the border of a side snapped window.
TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisWhenSideSnapped) {
// TODO: investigate failure. http://crbug.com/699175.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
gfx::Rect restored_bounds(10, 10, 50, 50);
@@ -326,7 +326,7 @@ TEST_F(WorkspaceEventHandlerTest,
// Test the behavior as a result of double clicking the window header.
TEST_F(WorkspaceEventHandlerTest, DoubleClickCaptionTogglesMaximize) {
// TODO: investigate failure. http://crbug.com/699175.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
aura::test::TestWindowDelegate delegate;
@@ -409,7 +409,7 @@ TEST_F(WorkspaceEventHandlerTest,
TEST_F(WorkspaceEventHandlerTest, DoubleTapCaptionTogglesMaximize) {
// TODO: investigate failure. http://crbug.com/699175.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
aura::test::TestWindowDelegate delegate;

Powered by Google App Engine
This is Rietveld 408576698