chrome/browser/ui/ash/ash_util.cc - Issue 2752593008: Move AcceleratorController from WmShell to Shell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)

Patch Set: fix include Created 3 years, 9 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:

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 591c9d5593618da9d1cebdfa360c0e986c0f7957..77ef383bddac3a5919dfdb2baddb44ac1b455d19 100644

--- a/chrome/browser/ui/ash/ash_util.cc

+++ b/chrome/browser/ui/ash/ash_util.cc

@@ -6,7 +6,7 @@

#include "ash/common/accelerators/accelerator_controller.h"

#include "ash/common/mojo_interface_factory.h"

-#include "ash/common/wm_shell.h"

+#include "ash/shell.h"

#include "base/macros.h"

#include "build/build_config.h"

#include "chrome/browser/ui/ash/ash_init.h"

@@ -67,8 +67,7 @@ bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {

if (IsRunningInMash())

return false;

- return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(

- accelerator);

+ return ash::Shell::Get()->accelerator_controller()->IsDeprecated(accelerator);

}

} // namespace ash_util