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

Unified Diff: ash/test/ash_test.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/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test.cc
diff --git a/ash/test/ash_test.cc b/ash/test/ash_test.cc
index 0d7a8bd2ed927cac728480b54f42406d845381ef..125dfc15427db62efb185c248a4091fe803f49b4 100644
--- a/ash/test/ash_test.cc
+++ b/ash/test/ash_test.cc
@@ -4,6 +4,7 @@
#include "ash/test/ash_test.h"
+#include "ash/public/cpp/config.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
@@ -108,7 +109,7 @@ display::Display AshTest::GetSecondaryDisplay() {
bool AshTest::SetSecondaryDisplayPlacement(
display::DisplayPlacement::Position position,
int offset) {
- if (ShellPort::Get()->IsRunningInMash()) {
+ if (Shell::GetAshConfig() == Config::MASH) {
NOTIMPLEMENTED();
return false;
}
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698