Revert 160696 - Decouple EventClientImpl and root window. Check containers on the same root window …

ash/root_window_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
 class SkBitmap;
 
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
 namespace shared {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 }  // namespace shared
 }  // namespace aura
 
 namespace ash {
 class ToplevelWindowEventHandler;
 namespace internal {
 
+class EventClientImpl;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
 class WorkspaceController;
 
 // This class maintains the per root window state for ash. This class
 // owns the root window and other dependent objects that should be
 // deleted upon the deletion of the root window.  The RootWindowController
 // for particular root window is stored as a property and can be obtained
@@ skipping 55 matching lines @@
 
   scoped_ptr<aura::RootWindow> root_window_;
   RootWindowLayoutManager* root_window_layout_;
 
   // A background layer that's displayed beneath all other layers.  Without
   // this, portions of the root window that aren't covered by layers will be
   // painted white; this can show up if e.g. it takes a long time to decode the
   // desktop background image when displaying the login screen.
   scoped_ptr<SystemBackgroundController> background_;
 
+  // An event filter that pre-handles all key events to send them to an IME.
+  scoped_ptr<EventClientImpl> event_client_;
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_