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

Unified Diff: ash/mus/accelerators/accelerator_controller_registrar.cc

Issue 2901413005: [mus+ash] Removes WmWindow from ash/accelerators (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/accelerators (rebased) Created 3 years, 7 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
« no previous file with comments | « ash/accelerators/accelerator_router.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/accelerators/accelerator_controller_registrar.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
index 6f0c197457fcecd7f455ed1eb961d1e051720e60..bff6040fe6ccd8543b977ec63c9871823b093df8 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -14,7 +14,6 @@
#include "ash/shell.h"
#include "ash/wm/window_cycle_controller.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
#include "base/logging.h"
#include "services/ui/common/accelerator_util.h"
#include "services/ui/public/cpp/property_type_converters.h"
@@ -96,8 +95,8 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
if (!target_window)
target_window = Shell::GetRootWindowForNewWindows();
DCHECK(target_window);
- if (router_->ProcessAccelerator(WmWindow::Get(target_window),
- *(event.AsKeyEvent()), accelerator)) {
+ if (router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
+ accelerator)) {
return ui::mojom::EventResult::HANDLED;
}
if (accelerator_controller->IsActionForAcceleratorEnabled(accelerator)) {
« no previous file with comments | « ash/accelerators/accelerator_router.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698