| 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) {
|
|
|