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

Unified Diff: chrome/browser/ui/ash/ash_util.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 years, 4 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: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index eeb288aaa6e3f108b90b8e972ab87234d7665a92..30605b6118c35d30032e1ea33f456044bc851533 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -8,11 +8,8 @@
#include "ash/common/wm_shell.h"
#include "build/build_config.h"
#include "chrome/browser/ui/ash/ash_init.h"
-#include "ui/aura/window_event_dispatcher.h"
-
-#if defined(MOJO_SHELL_CLIENT)
#include "services/shell/runner/common/client_util.h"
-#endif
+#include "ui/aura/window_event_dispatcher.h"
namespace chrome {
@@ -21,11 +18,7 @@ bool ShouldOpenAshOnStartup() {
}
bool IsRunningInMash() {
-#if defined(MOJO_SHELL_CLIENT)
return shell::ShellIsRemote();
-#else
- return false;
-#endif
}
bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698