mash: Use ash shell window container ids instead of ash::mojom::Container

ash/common/wm/window_cycle_controller.cc

 // Copyright 2014 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/common/wm/window_cycle_controller.h"
 
 #include "ash/common/metrics/task_switch_source.h"
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
 #include "ash/common/wm/window_cycle_list.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/metrics/histogram.h"
 
 namespace ash {
 
 namespace {
 
 // Returns the most recently active window from the |window_list| or nullptr
 // if the list is empty.
 WmWindow* GetActiveWindow(const MruWindowTracker::WindowList& window_list) {
   return window_list.empty() ? nullptr : window_list[0];
@@ skipping 76 matching lines @@
 
   if (active_window_after_window_cycle != nullptr &&
       active_window_before_window_cycle_ != active_window_after_window_cycle) {
     WmShell::Get()->RecordTaskSwitchMetric(
         TaskSwitchSource::WINDOW_CYCLE_CONTROLLER);
   }
   active_window_before_window_cycle_ = nullptr;
 }
 
 }  // namespace ash