chromeos: fix focus for mushrome

ash/mus/window_manager.cc

 // Copyright 2015 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/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/shell_port_mash.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/top_level_window_factory.h"
 #include "ash/mus/window_properties.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"

[msw, 2017/04/26 23:01:08]

nit: remove if no longer needed

[sky, 2017/04/26 23:30:27]

Done.

 #include "ash/public/cpp/window_pin_type.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/public/interfaces/window_pin_type.mojom.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/container_finder.h"
@@ skipping 207 matching lines @@
 void WindowManager::CreateAndRegisterRootWindowController(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display,
     RootWindowController::RootWindowType root_window_type) {
   RootWindowSettings* root_window_settings =
       InitRootWindowSettings(window_tree_host->window());
   root_window_settings->display_id = display.id();
   std::unique_ptr<RootWindowController> root_window_controller(
       new RootWindowController(nullptr, window_tree_host.release()));
   root_window_controller->Init(root_window_type);
-  // TODO: To avoid lots of IPC AddActivationParent() should take an array.
-  // http://crbug.com/682048.
-  aura::Window* root_window = root_window_controller->GetRootWindow();
-  for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
-    window_manager_client_->AddActivationParent(
-        root_window->GetChildById(kActivatableShellWindowIds[i]));
-  }
   root_window_controllers_.insert(std::move(root_window_controller));
 }
 
 void WindowManager::DestroyRootWindowController(
     RootWindowController* root_window_controller,
     bool in_shutdown) {
   if (!in_shutdown && root_window_controllers_.size() > 1) {
     DCHECK_NE(root_window_controller, GetPrimaryRootWindowController());
     root_window_controller->MoveWindowsTo(
         GetPrimaryRootWindowController()->GetRootWindow());
@@ skipping 299 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::Get()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::Get()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash