| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/ash_util.h" | 5 #include "chrome/browser/ui/ash/ash_util.h" |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/common/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/ui/ash/ash_init.h" | 10 #include "chrome/browser/ui/ash/ash_init.h" |
| 11 #include "services/service_manager/runner/common/client_util.h" | 11 #include "services/service_manager/runner/common/client_util.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
| 13 | 13 |
| 14 namespace chrome { | 14 namespace chrome { |
| 15 | 15 |
| 16 bool ShouldOpenAshOnStartup() { | 16 bool ShouldOpenAshOnStartup() { |
| 17 return !IsRunningInMash(); | 17 return !IsRunningInMash(); |
| 18 } | 18 } |
| 19 | 19 |
| 20 bool IsRunningInMash() { | 20 bool IsRunningInMash() { |
| 21 return shell::ShellIsRemote(); | 21 return service_manager::ServiceManagerIsRemote(); |
| 22 } | 22 } |
| 23 | 23 |
| 24 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) { | 24 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) { |
| 25 // When running in mash the browser doesn't handle ash accelerators. | 25 // When running in mash the browser doesn't handle ash accelerators. |
| 26 if (chrome::IsRunningInMash()) | 26 if (chrome::IsRunningInMash()) |
| 27 return false; | 27 return false; |
| 28 | 28 |
| 29 return ash::WmShell::Get()->accelerator_controller()->IsDeprecated( | 29 return ash::WmShell::Get()->accelerator_controller()->IsDeprecated( |
| 30 accelerator); | 30 accelerator); |
| 31 } | 31 } |
| 32 | 32 |
| 33 } // namespace chrome | 33 } // namespace chrome |
| OLD | NEW |