mash: remove more shell/shelf WmWindow usage.

ash/wm/window_positioning_utils.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 "ash/wm/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm_window.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
@@ skipping 124 matching lines @@
       int container_id = window->GetParent()->aura_window()->id();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
       if (!SystemModalContainerLayoutManager::IsModalBackground(
               window->aura_window()))
         dst_container = dst_root->GetChildByShellWindowId(container_id);
     }
 
     if (dst_container && window->GetParent() != dst_container) {
-      WmWindow* focused = WmWindow::Get(GetFocusedWindow());
-      WmWindow* active = WmWindow::Get(GetActiveWindow());
+      aura::Window* focused = GetFocusedWindow();
+      aura::Window* active = GetActiveWindow();
 
       aura::WindowTracker tracker;
       if (focused)
-        tracker.Add(focused->aura_window());
+        tracker.Add(focused);
       if (active && focused != active)
-        tracker.Add(active->aura_window());
+        tracker.Add(active);
 
       gfx::Point origin = bounds_in_screen.origin();
       const gfx::Point display_origin = display.bounds().origin();
       origin.Offset(-display_origin.x(), -display_origin.y());
       gfx::Rect new_bounds = gfx::Rect(origin, bounds_in_screen.size());
 
       // Set new bounds now so that the container's layout manager can adjust
       // the bounds if necessary.
       window->SetBounds(new_bounds);
 
       dst_container->AddChild(window);
 
       MoveAllTransientChildrenToNewRoot(display, window);
 
       // Restore focused/active window.
-      if (focused && tracker.Contains(focused->aura_window())) {
-        focused->SetFocused();
+      if (focused && tracker.Contains(focused)) {
+        aura::client::GetFocusClient(focused)->FocusWindow(focused);
         Shell::Get()->set_root_window_for_new_windows(focused->GetRootWindow());
-      } else if (active && tracker.Contains(active->aura_window())) {
-        active->Activate();
+      } else if (active && tracker.Contains(active)) {
+        wm::ActivateWindow(active);
       }
       // TODO(oshima): We should not have to update the bounds again
       // below in theory, but we currently do need as there is a code
       // that assumes that the bounds will never be overridden by the
       // layout mananger. We should have more explicit control how
       // constraints are applied by the layout manager.
     }
   }
   gfx::Point origin(bounds_in_screen.origin());
   const gfx::Point display_origin =
       window->GetDisplayNearestWindow().bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds_in_screen.size()));
 }
 
 }  // namespace wm
 }  // namespace ash