1 files changed, 14 insertions, 3 deletions
diff --git a/chromium/ui/aura/window_targeter.h b/chromium/ui/aura/window_targeter.h
index 4457f77c371..e64ef75f807 100644
--- a/chromium/ui/aura/window_targeter.h
+++ b/chromium/ui/aura/window_targeter.h
@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef UI_AURA_WINDOW_TARGETER_H_
+#define UI_AURA_WINDOW_TARGETER_H_
+
+#include "ui/aura/aura_export.h"
 #include "ui/events/event_targeter.h"
 
 namespace aura {
 
 class Window;
 
-class WindowTargeter : public ui::EventTargeter {
+class AURA_EXPORT WindowTargeter : public ui::EventTargeter {
  public:
   WindowTargeter();
   virtual ~WindowTargeter();
@@ -20,11 +24,16 @@ class WindowTargeter : public ui::EventTargeter {
   virtual ui::EventTarget* FindTargetForLocatedEvent(
       ui::EventTarget* root,
       ui::LocatedEvent* event) OVERRIDE;
-  virtual bool SubtreeShouldBeExploredForEvent(
+  virtual bool SubtreeCanAcceptEvent(
+      ui::EventTarget* target,
+      const ui::LocatedEvent& event) const OVERRIDE;
+  virtual bool EventLocationInsideBounds(
       ui::EventTarget* target,
-      const ui::LocatedEvent& event) OVERRIDE;
+      const ui::LocatedEvent& event) const OVERRIDE;
 
  private:
+  Window* FindTargetForKeyEvent(Window* root_window,
+                                const ui::KeyEvent& event);
   Window* FindTargetInRootWindow(Window* root_window,
                                  const ui::LocatedEvent& event);
 
@@ -32,3 +41,5 @@ class WindowTargeter : public ui::EventTargeter {
 };
 
 }  // namespace aura
+
+#endif  // UI_AURA_WINDOW_TARGETER_H_