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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/screen_util_unittest.cc

Issue 2815043002: Removes ShellPort::IsRunningInMash() (Closed)
Patch Set: dont set instance_ in constructor 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
« no previous file with comments | « ash/rotator/screen_rotation_animator_unittest.cc ('k') | ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_util_unittest.cc
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index bf07727c0ea42f09efb1636aa103618d11fedf7a..c72c16a4cb3f64176e587098f9c47c5b39fa1254 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -4,8 +4,8 @@
#include "ash/screen_util.h"
+#include "ash/public/cpp/config.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"
@@ -106,7 +106,7 @@ TEST_F(ScreenUtilTest, ConvertRect) {
TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) {
// TODO: requires unified desktop mode. http://crbug.com/581462.
- if (ShellPort::Get()->IsRunningInMash())
+ if (Shell::GetAshConfig() == Config::MASH)
return;
display_manager()->SetUnifiedDesktopEnabled(true);
« no previous file with comments | « ash/rotator/screen_rotation_animator_unittest.cc ('k') | ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698