aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/.

ui/aura/shared/input_method_event_filter.h

Index: ui/aura/shared/input_method_event_filter.h
diff --git a/ash/ime/input_method_event_filter.h b/ui/aura/shared/input_method_event_filter.h
similarity index 79%
rename from ash/ime/input_method_event_filter.h
rename to ui/aura/shared/input_method_event_filter.h
index a65660ebc2f87587a045881ce6379d62cac953c1..5fc304f25be64583f92b824b6e01bfb69523c02a 100644
--- a/ash/ime/input_method_event_filter.h
+++ b/ui/aura/shared/input_method_event_filter.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_IME_INPUT_METHOD_EVENT_FILTER_H_
-#define ASH_IME_INPUT_METHOD_EVENT_FILTER_H_
+#ifndef UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
+#define UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
 #pragma once
 
-#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/aura/aura_export.h"
 #include "ui/aura/event_filter.h"
 #include "ui/base/ime/input_method_delegate.h"
 
@@ -17,16 +17,18 @@ namespace ui {
 class InputMethod;
 }
 
-namespace ash {
-namespace internal {
+namespace aura {
+class RootWindow;
+
+namespace shared {
 
 // An event filter that forwards a KeyEvent to a system IME, and dispatches a
 // TranslatedKeyEvent to the root window as needed.
-class ASH_EXPORT InputMethodEventFilter
+class AURA_EXPORT InputMethodEventFilter
     : public aura::EventFilter,
       public ui::internal::InputMethodDelegate {
  public:
-  InputMethodEventFilter();
+  InputMethodEventFilter(RootWindow* root_window);

[Ben Goodger (Google), 2012/05/15 17:35:13]

explicit

   virtual ~InputMethodEventFilter();
 
  private:
@@ -50,10 +52,12 @@ class ASH_EXPORT InputMethodEventFilter
 
   scoped_ptr<ui::InputMethod> input_method_;
 
+  RootWindow* root_window_;   // weak ptr

[Ben Goodger (Google), 2012/05/15 17:35:13]

such ptrs are assumed weak unless scoped or otherwise noted.

+
   DISALLOW_COPY_AND_ASSIGN(InputMethodEventFilter);
 };
 
-}  // namespace internal
-}  // namespace ash
+}  // namespace shared
+}  // namespace aura
 
-#endif  // ASH_IME_INPUT_METHOD_EVENT_FILTER_H_
+#endif  // UI_AURA_IME_INPUT_METHOD_EVENT_FILTER_H_