Wires up immersive mode for chrome and mash

services/ui/ws/window_manager_state.cc

 // Copyright 2016 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 "services/ui/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
@@ skipping 485 matching lines @@
 
   base::WeakPtr<Accelerator> weak_accelerator;
   if (accelerator)
     weak_accelerator = accelerator->GetWeakPtr();
   DispatchInputEventToWindowImpl(target, client_id, event, weak_accelerator);
 }
 
 ClientSpecificId WindowManagerState::GetEventTargetClientId(
     const ServerWindow* window,
     bool in_nonclient_area) {
-  // If the event is in the non-client area the event goes to the owner of
-  // the window.
-  WindowTree* tree = nullptr;
   if (in_nonclient_area) {
-    tree = window_server()->GetTreeWithId(window->id().client_id);
-  } else {
-    // If the window is an embed root, forward to the embedded window.
-    tree = window_server()->GetTreeWithRoot(window);
-    if (!tree)
-      tree = window_server()->GetTreeWithId(window->id().client_id);
+    // Events in the non-client area always go to the window manager.
+    return window_tree_->id();
   }
 
-  if (tree) {
-    const ServerWindow* embed_root =
-        tree->HasRoot(window) ? window : GetEmbedRoot(window);
-    while (tree && tree->embedder_intercepts_events()) {
-      DCHECK(tree->HasRoot(embed_root));
-      tree = window_server()->GetTreeWithId(embed_root->id().client_id);
-      embed_root = GetEmbedRoot(embed_root);
-    }
+  // If the window is an embed root, it goes to the tree embedded in the window.
+  WindowTree* tree = window_server()->GetTreeWithRoot(window);
+  if (!tree) {
+    // Window is not an embed root, event goes to owner of the window.
+    tree = window_server()->GetTreeWithId(window->id().client_id);
   }
+  DCHECK(tree);
 
-  if (!tree) {
-    DCHECK(in_nonclient_area);
-    tree = window_tree_;
+  // Ascend to the first tree marked as not embedder_intercepts_events().
+  const ServerWindow* embed_root =
+      tree->HasRoot(window) ? window : GetEmbedRoot(window);
+  while (tree && tree->embedder_intercepts_events()) {
+    DCHECK(tree->HasRoot(embed_root));
+    tree = window_server()->GetTreeWithId(embed_root->id().client_id);
+    embed_root = GetEmbedRoot(embed_root);
   }
+  DCHECK(tree);
   return tree->id();
 }
 
 ServerWindow* WindowManagerState::GetRootWindowContaining(
     gfx::Point* location) {
   if (display_manager()->displays().empty())
       return nullptr;
 
   Display* target_display = nullptr;
   for (Display* display : display_manager()->displays()) {
@@ skipping 23 matching lines @@
   return display_root->root();
 }
 
 void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
   window_server()->SendToPointerWatchers(event, user_id(), nullptr, /* window */
                                          nullptr /* ignore_tree */);
 }
 
 }  // namespace ws
 }  // namespace ui