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

Unified Diff: ash/shell.cc

Issue 11314013: Register a separate default ui::EventTarget for Aura (Ash) to ensure that it does not interfere wit… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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/shell.h ('k') | ash/wm/event_client_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 163961)
+++ ash/shell.cc (working copy)
@@ -510,11 +510,11 @@
}
void Shell::AddEnvEventFilter(aura::EventFilter* filter) {
- aura::Env::GetInstance()->AddPreTargetHandler(filter);
+ AddPreTargetHandler(filter);
}
void Shell::RemoveEnvEventFilter(aura::EventFilter* filter) {
- aura::Env::GetInstance()->RemovePreTargetHandler(filter);
+ RemovePreTargetHandler(filter);
}
void Shell::ShowContextMenu(const gfx::Point& location_in_screen) {
@@ -802,4 +802,12 @@
return false;
}
+bool Shell::CanAcceptEvents() {
+ return true;
+}
+
+ui::EventTarget* Shell::GetParentTarget() {
+ return NULL;
+}
+
} // namespace ash
« no previous file with comments | « ash/shell.h ('k') | ash/wm/event_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698