Decouple EventClientImpl and root window. Check containers on the same root window as focused windo…

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3627616f794080c682bfccd2f5e06b325d2f8a1f..9de3e0918b66331d66c866ee55f098d6613fafdd 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -256,6 +256,7 @@ Shell::~Shell() {
   resize_shadow_controller_.reset();
   shadow_controller_.reset();
   tooltip_controller_.reset();
+  event_client_.reset();
   window_cycle_controller_.reset();
   capture_controller_.reset();
   nested_dispatcher_controller_.reset();
@@ -348,6 +349,12 @@ aura::Window* Shell::GetContainer(aura::RootWindow* root_window,
 }
 
 // static
+const aura::Window* Shell::GetContainer(const aura::RootWindow* root_window,

[Daniel Erat, 2012/10/08 14:41:51]

i think there was a misunderstanding earlier.  why can't you have a single
method with this signature?

aura::Window* Shell::GetContainer(const aura::RootWindow* root_window,
                                  int container_id);

it should be fine to pass a non-const root window to this method, no?

[oshima, 2012/10/08 17:52:59]

You can't unless you do const_cast in the implementation, which makes
const less useful. In UI code (AFAIK), we don't allow a const method that
returns non const objects that are part of the internal state. That's why
we have two, const and non const versino of GetChildById methods
(same for transient_parent and other places))

[Daniel Erat, 2012/10/08 18:24:25]

Thanks, I missed that you were invoking a const method on the RootWindow that
returns a const Window.

+                                        int container_id) {
+  return root_window->GetChildById(container_id);
+}
+
+// static
 std::vector<aura::Window*> Shell::GetAllContainers(int container_id) {
   std::vector<aura::Window*> containers;
   aura::Window* container = GetPrimaryRootWindow()->GetChildById(container_id);
@@ -448,6 +455,8 @@ void Shell::Init() {
       drag_drop_controller_.get()));
   AddEnvEventFilter(tooltip_controller_.get());
 
+  event_client_.reset(new internal::EventClientImpl);
+
   InitRootWindowController(root_window_controller);
 
   // This controller needs to be set before SetupManagedWindowMode.
@@ -731,6 +740,7 @@ void Shell::InitRootWindowController(
                                         screen_position_controller_.get());
   aura::client::SetCursorClient(root_window, &cursor_manager_);
   aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
+  aura::client::SetEventClient(root_window, event_client_.get());
 
   if (nested_dispatcher_controller_.get()) {
     aura::client::SetDispatcherClient(root_window,