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

Unified Diff: ash/aura/shell_port_classic.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/aura/shell_port_classic.h ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/shell_port_classic.cc
diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
index 5da492de9b01f7f098c852c4d4b6c1afb37df910..9d87e869ec42fc806c881927be458698d84534f7 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -54,7 +54,7 @@ ShellPortClassic::~ShellPortClassic() {}
// static
ShellPortClassic* ShellPortClassic::Get() {
- CHECK(!ShellPort::Get()->IsRunningInMash());
+ CHECK(Shell::GetAshConfig() == Config::CLASSIC);
return static_cast<ShellPortClassic*>(ShellPort::Get());
}
@@ -69,10 +69,6 @@ void ShellPortClassic::Shutdown() {
Shell::Get()->window_tree_host_manager()->Shutdown();
}
-bool ShellPortClassic::IsRunningInMash() const {
- return false;
-}
-
Config ShellPortClassic::GetAshConfig() const {
return Config::CLASSIC;
}
« no previous file with comments | « ash/aura/shell_port_classic.h ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698