Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/wm/window_util.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/wm/window_util.h"
 
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 namespace wm {
 
+namespace {
+
+// Move the |window| to the target |root|, using the corresponding container.

[James Cook, 2017/02/15 00:44:40]

nit: document return value ("True if it actually moved"?)

[msw, 2017/02/15 19:59:18]

Done.

+bool MoveWindowToRoot(aura::Window* window, aura::Window* root) {
+  if (!root || root == window->GetRootWindow())
+    return false;
+  aura::Window* container = RootWindowController::ForWindow(root)->GetContainer(
+      window->parent()->id());
+  if (!container)
+    return false;
+  container->AddChild(window);
+  return true;
+}
+
+}  // namespace
+
 // TODO(beng): replace many of these functions with the corewm versions.
 void ActivateWindow(aura::Window* window) {
   ::wm::ActivateWindow(window);
 }
 
 void DeactivateWindow(aura::Window* window) {
   ::wm::DeactivateWindow(window);
 }
 
 bool IsActiveWindow(aura::Window* window) {
@@ skipping 15 matching lines @@
 
 bool IsWindowUserPositionable(aura::Window* window) {
   return GetWindowState(window)->IsUserPositionable();
 }
 
 void PinWindow(aura::Window* window, bool trusted) {
   wm::WMEvent event(trusted ? wm::WM_EVENT_TRUSTED_PIN : wm::WM_EVENT_PIN);
   wm::GetWindowState(window)->OnWMEvent(&event);
 }
 
+bool MoveWindowToDisplay(aura::Window* window, int64_t display_id) {

[James Cook, 2017/02/15 00:44:40]

DCHECK(window) and that display_id is valid?

[msw, 2017/02/15 19:59:18]

Added DCHECK(window), but left it returning false for invalid display ids.

+  WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(display_id);
+  return root && MoveWindowToRoot(window, root->aura_window());
+}
+
 bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
   views::View* target = static_cast<views::View*>(event.target());
   if (!target)
     return false;
-  aura::Window* target_root =
-      target->GetWidget()->GetNativeView()->GetRootWindow();
-  if (!target_root || target_root == window->GetRootWindow())
-    return false;
-  aura::Window* window_container = RootWindowController::ForWindow(target_root)
-                                       ->GetContainer(window->parent()->id());
-  // Move the window to the target launcher.
-  window_container->AddChild(window);
-  return true;
+  aura::Window* root = target->GetWidget()->GetNativeView()->GetRootWindow();
+  return root && MoveWindowToRoot(window, root);
 }
 
 void SnapWindowToPixelBoundary(aura::Window* window) {
   window->SetProperty(kSnapChildrenToPixelBoundary, true);
   aura::Window* snapped_ancestor = window->parent();
   while (snapped_ancestor) {
     if (snapped_ancestor->GetProperty(kSnapChildrenToPixelBoundary)) {
       ui::SnapLayerToPhysicalPixelBoundary(snapped_ancestor->layer(),
                                            window->layer());
       return;
     }
     snapped_ancestor = snapped_ancestor->parent();
   }
 }
 
 void SetSnapsChildrenToPhysicalPixelBoundary(aura::Window* container) {
   DCHECK(!container->GetProperty(kSnapChildrenToPixelBoundary))
       << container->GetName();
   container->SetProperty(kSnapChildrenToPixelBoundary, true);
 }
 
 }  // namespace wm
 }  // namespace ash