| 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 7188b70b93ce369b6e9d0d51cbf858a81aedcca7..591c9d5593618da9d1cebdfa360c0e986c0f7957 100644
|
| --- a/chrome/browser/ui/ash/ash_util.cc
|
| +++ b/chrome/browser/ui/ash/ash_util.cc
|
| @@ -54,10 +54,6 @@ std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
|
| return base::MakeUnique<EmbeddedAshService>(task_runner);
|
| }
|
|
|
| -} // namespace ash_util
|
| -
|
| -namespace chrome {
|
| -
|
| bool ShouldOpenAshOnStartup() {
|
| return !IsRunningInMash();
|
| }
|
| @@ -68,11 +64,11 @@ bool IsRunningInMash() {
|
|
|
| bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
|
| // When running in mash the browser doesn't handle ash accelerators.
|
| - if (chrome::IsRunningInMash())
|
| + if (IsRunningInMash())
|
| return false;
|
|
|
| return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(
|
| accelerator);
|
| }
|
|
|
| -} // namespace chrome
|
| +} // namespace ash_util
|
|
|