mash: remove more shell/shelf WmWindow usage.

ash/mus/accelerators/accelerator_controller_registrar.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/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_router.h"
@@ skipping 74 matching lines @@
     // is called for *all* key events, where as this is only called for
     // registered accelerators. This means the previous accelerator isn't the
     // same as it was in ash. We need to figure out exactly what is needed of
     // previous accelerator so that we can either register for the right set of
     // accelerators, or make WS send the previous accelerator.
     // http://crbug.com/630683.
     accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
         accelerator);
     if (HandleWindowCycleAccelerator(accelerator))
       return ui::mojom::EventResult::HANDLED;
-    WmWindow* target_window = WmWindow::Get(wm::GetFocusedWindow());
+    aura::Window* target_window = wm::GetFocusedWindow();
     if (!target_window)
-      target_window = Shell::GetWmRootWindowForNewWindows();
+      target_window = Shell::GetRootWindowForNewWindows();
     DCHECK(target_window);
-    if (router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
-                                    accelerator)) {
+    if (router_->ProcessAccelerator(WmWindow::Get(target_window),
+                                    *(event.AsKeyEvent()), accelerator)) {
       return ui::mojom::EventResult::HANDLED;
     }
     if (accelerator_controller->IsActionForAcceleratorEnabled(accelerator)) {
       // We do have an accelerator for the key. Set a property so that the real
       // target knows we have an accelerator.
       (*properties)[mojom::kWillProcessAccelerator_KeyEventProperty] =
           std::vector<uint8_t>();
     }
     return ui::mojom::EventResult::UNHANDLED;
   }
@@ skipping 106 matching lines @@
   if (accelerator == window_cycle_cancel_accelerator_) {
     window_cycle_controller->CancelCycling();
     return true;
   }
 
   return false;
 }
 
 }  // namespace mus
 }  // namespace ash