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

ash/root_window_controller.cc

 // 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.
 
 #include "ash/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/base_layout_manager.h"
+#include "ash/wm/event_client_impl.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/system_background_controller.h"
 #include "ash/wm/workspace_controller.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 110 matching lines @@
   container->SetProperty(internal::kUsesScreenCoordinatesKey, true);
 }
 
 }  // namespace
 
 namespace internal {
 
 RootWindowController::RootWindowController(aura::RootWindow* root_window)
     : root_window_(root_window) {
   SetRootWindowController(root_window, this);
+
+  event_client_.reset(new EventClientImpl(root_window));
   screen_dimmer_.reset(new ScreenDimmer(root_window));
 }
 
 RootWindowController::~RootWindowController() {
   Shutdown();
   root_window_.reset();
 }
 
 void RootWindowController::Shutdown() {
   CloseChildWindows();
   if (Shell::GetActiveRootWindow() == root_window_.get()) {
     Shell::GetInstance()->set_active_root_window(
         Shell::GetPrimaryRootWindow() == root_window_.get() ?
         NULL : Shell::GetPrimaryRootWindow());
   }
   SetRootWindowController(root_window_.get(), NULL);
+  event_client_.reset();
   screen_dimmer_.reset();
   workspace_controller_.reset();
   // Forget with the display ID so that display lookup
   // ends up with invalid display.
   root_window_->ClearProperty(kDisplayIdKey);
   // And this root window should no longer process events.
   root_window_->PrepareForShutdown();
 }
 
 SystemModalContainerLayoutManager*
@@ skipping 248 matching lines @@
 
   aura::Window* overlay_container = CreateContainer(
       kShellWindowId_OverlayContainer,
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 }
 
 }  // namespace internal
 }  // namespace ash