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

Unified Diff: ash/screen_util_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/screen_util_unittest.cc
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index d60faa8a4c9cf06c28e0644277684d6c5277bc98..bf07727c0ea42f09efb1636aa103618d11fedf7a 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -5,10 +5,10 @@
#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_util.h"
#include "ash/wm/wm_screen_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -106,7 +106,7 @@ TEST_F(ScreenUtilTest, ConvertRect) {
TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) {
// TODO: requires unified desktop mode. http://crbug.com/581462.
- if (WmShell::Get()->IsRunningInMash())
+ if (ShellPort::Get()->IsRunningInMash())
return;
display_manager()->SetUnifiedDesktopEnabled(true);

Powered by Google App Engine
This is Rietveld 408576698