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

Unified Diff: ash/display/display_configuration_controller_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/display/display_configuration_controller_unittest.cc
diff --git a/ash/display/display_configuration_controller_unittest.cc b/ash/display/display_configuration_controller_unittest.cc
index c41258c2002a0db2eec10628454e636ea44e1b7c..13f9f84c377622a98d42468f83c71508370181c8 100644
--- a/ash/display/display_configuration_controller_unittest.cc
+++ b/ash/display/display_configuration_controller_unittest.cc
@@ -4,9 +4,9 @@
#include "ash/rotator/screen_rotation_animator.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_configuration_controller_test_api.h"
-#include "ash/wm_shell.h"
#include "base/macros.h"
#include "ui/display/manager/display_manager.h"
@@ -17,7 +17,7 @@ using DisplayConfigurationControllerTest = test::AshTestBase;
TEST_F(DisplayConfigurationControllerTest, ErasesAnimatorOnAnimationEnded) {
// TODO(wutao): needs display_configuration_controller
// http://crbug.com/686839.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();

Powered by Google App Engine
This is Rietveld 408576698