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

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 147203004: aura: Remove event-dispatch methods from WindowTreeHostDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win Created 6 years, 11 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 | « ui/events/event_source.cc ('k') | ui/views/corewm/capture_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index f31407a7ba4de732213a5fa4be278d84a941098d..9779e9b070162ec4ce925b1b50b925d337ffd055 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -29,7 +29,8 @@ void SendProcessKeyEvent(ui::EventType type,
ui::TranslatedKeyEvent event(type == ui::ET_KEY_PRESSED,
ui::VKEY_PROCESSKEY,
ui::EF_NONE);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&event);
+ ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&event);
+ CHECK(!details.dispatcher_destroyed);
}
base::LazyInstance<base::Time> g_keyboard_load_time_start =
@@ -99,17 +100,23 @@ bool MoveCursor(int swipe_direction,
// First deal with the x movement.
if (codex != ui::VKEY_UNKNOWN) {
ui::KeyEvent press_event(ui::ET_KEY_PRESSED, codex, modifier_flags, 0);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&press_event);
+ ui::EventDispatchDetails details =
+ dispatcher->OnEventFromSource(&press_event);
+ CHECK(!details.dispatcher_destroyed);
ui::KeyEvent release_event(ui::ET_KEY_RELEASED, codex, modifier_flags, 0);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&release_event);
+ details = dispatcher->OnEventFromSource(&release_event);
+ CHECK(!details.dispatcher_destroyed);
}
// Then deal with the y movement.
if (codey != ui::VKEY_UNKNOWN) {
ui::KeyEvent press_event(ui::ET_KEY_PRESSED, codey, modifier_flags, 0);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&press_event);
+ ui::EventDispatchDetails details =
+ dispatcher->OnEventFromSource(&press_event);
+ CHECK(!details.dispatcher_destroyed);
ui::KeyEvent release_event(ui::ET_KEY_RELEASED, codey, modifier_flags, 0);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&release_event);
+ details = dispatcher->OnEventFromSource(&release_event);
+ CHECK(!details.dispatcher_destroyed);
}
return true;
}
@@ -162,7 +169,8 @@ bool SendKeyEvent(const std::string type,
}
ui::KeyEvent event(event_type, code, key_name, modifiers, false);
- dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&event);
+ ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&event);
+ CHECK(!details.dispatcher_destroyed);
}
return true;
}
« no previous file with comments | « ui/events/event_source.cc ('k') | ui/views/corewm/capture_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698