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

Unified Diff: ash/shell.h

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 | « no previous file | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
===================================================================
--- ash/shell.h (revision 163961)
+++ ash/shell.h (working copy)
@@ -18,6 +18,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
+#include "ui/base/events/event_target.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/size.h"
@@ -115,7 +116,8 @@
//
// Upon creation, the Shell sets itself as the RootWindow's delegate, which
// takes ownership of the Shell.
-class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
+class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
+ public ui::EventTarget {
public:
typedef std::vector<aura::RootWindow*> RootWindowList;
typedef std::vector<internal::RootWindowController*> RootWindowControllerList;
@@ -192,6 +194,10 @@
active_root_window_ = active_root_window;
}
+ // Overridden from ui::EventTarget:
Ben Goodger (Google) 2012/10/28 04:24:20 move these to be the last functions in the private
+ virtual bool CanAcceptEvents() OVERRIDE;
+ virtual EventTarget* GetParentTarget() OVERRIDE;
+
// Adds or removes |filter| from the aura::Env's pre-target event-handler
// list.
void AddEnvEventFilter(aura::EventFilter* filter);
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698