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

Unified Diff: ash/accelerators/accelerator_router.h

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_delegate.cc ('k') | ash/accelerators/accelerator_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_router.h
diff --git a/ash/accelerators/accelerator_router.h b/ash/accelerators/accelerator_router.h
index a849d5afa52d22e0911d32a8b1e91f364039baa3..9734811c88840b7da12f8d9b87bd688bb4cb4959 100644
--- a/ash/accelerators/accelerator_router.h
+++ b/ash/accelerators/accelerator_router.h
@@ -9,6 +9,10 @@
#include "base/macros.h"
#include "base/time/time.h"
+namespace aura {
+class Window;
+}
+
namespace ui {
class Accelerator;
class KeyEvent;
@@ -16,8 +20,6 @@ class KeyEvent;
namespace ash {
-class WmWindow;
-
// AcceleratorRouter does a minimal amount of processing before routing the
// accelerator to the AcceleratorController. AcceleratorRouter may also decide
// not to process certain accelerators.
@@ -28,17 +30,17 @@ class ASH_EXPORT AcceleratorRouter {
// Returns true if event should be consumed. |target| is the target of the
// event.
- bool ProcessAccelerator(WmWindow* target,
+ bool ProcessAccelerator(aura::Window* target,
const ui::KeyEvent& event,
const ui::Accelerator& accelerator);
private:
// Returns true if the window should be allowed a chance to handle
// system keys.
- bool CanConsumeSystemKeys(WmWindow* target, const ui::KeyEvent& event);
+ bool CanConsumeSystemKeys(aura::Window* target, const ui::KeyEvent& event);
// Returns true if the |accelerator| should be processed now.
- bool ShouldProcessAcceleratorNow(WmWindow* target,
+ bool ShouldProcessAcceleratorNow(aura::Window* target,
const ui::KeyEvent& event,
const ui::Accelerator& accelerator);
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/accelerators/accelerator_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698