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

Unified Diff: ash/accelerators/accelerator_dispatcher.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_controller_unittest.cc ('k') | ash/accelerators/accelerator_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_dispatcher.cc
===================================================================
--- ash/accelerators/accelerator_dispatcher.cc (revision 150582)
+++ ash/accelerators/accelerator_dispatcher.cc (working copy)
@@ -17,10 +17,10 @@
#include "ash/shell.h"
#include "ash/wm/event_rewriter_event_filter.h"
#include "ui/aura/env.h"
-#include "ui/aura/event.h"
#include "ui/aura/event_filter.h"
#include "ui/aura/root_window.h"
#include "ui/base/accelerators/accelerator.h"
+#include "ui/base/event.h"
#include "ui/base/events.h"
namespace ash {
@@ -70,7 +70,7 @@
if (IsKeyEvent(event)) {
// Modifiers can be changed by the user preference, so we need to rewrite
// the event explicitly.
- aura::KeyEvent key_event(event, false);
+ ui::KeyEvent key_event(event, false);
aura::EventFilter* event_rewriter =
ash::Shell::GetInstance()->event_rewriter_filter();
DCHECK(event_rewriter);
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/accelerator_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698