Index: ash/mus/bridge/shell_port_mash.cc |
diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc |
index d740d0bf94d3eb94b333589abdc0ba7acb29bb2f..4a21aecacb068cb658b8e675101bcc2f9b6b5c96 100644 |
--- a/ash/mus/bridge/shell_port_mash.cc |
+++ b/ash/mus/bridge/shell_port_mash.cc |
@@ -23,6 +23,7 @@ |
#include "ash/mus/screen_mus.h" |
#include "ash/mus/window_manager.h" |
#include "ash/public/cpp/config.h" |
+#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/root_window_controller.h" |
#include "ash/root_window_settings.h" |
#include "ash/session/session_state_delegate.h" |
@@ -49,7 +50,10 @@ |
#include "ash/wm_window.h" |
#include "base/memory/ptr_util.h" |
#include "components/user_manager/user_info_impl.h" |
+#include "services/ui/public/interfaces/constants.mojom.h" |
msw
2017/04/26 23:01:08
nit: remove if not needed.
sky
2017/04/26 23:30:27
Done.
|
#include "ui/aura/env.h" |
+#include "ui/aura/mus/focus_synchronizer.h" |
msw
2017/04/26 23:01:08
nit: remove if not needed.
sky
2017/04/26 23:30:27
Done.
|
+#include "ui/aura/mus/window_manager_delegate.h" |
#include "ui/aura/mus/window_tree_client.h" |
#include "ui/aura/mus/window_tree_host_mus.h" |
#include "ui/aura/window.h" |
@@ -471,5 +475,16 @@ ShellPortMash::CreateAcceleratorController() { |
mash_state_->accelerator_controller_registrar.get()); |
} |
+void ShellPortMash::OnCreatedRootWindowContainers( |
+ RootWindowController* root_window_controller) { |
+ // 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_->window_manager_client()->AddActivationParent( |
+ root_window->GetChildById(kActivatableShellWindowIds[i])); |
+ } |
+} |
+ |
} // namespace mus |
} // namespace ash |