Centralizes more shared code between ash and mash

ash/common/wm/container_finder.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/common/wm/container_finder.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/root_window_finder.h"
@@ skipping 35 matching lines @@
   int window_container_id =
       window->GetTransientParent()->GetParent()->GetShellWindowId();
   if (window_container_id < kShellWindowId_LockScreenContainer)
     return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
   return root->GetChildByShellWindowId(kShellWindowId_LockSystemModalContainer);
 }
 
 WmWindow* GetContainerFromAlwaysOnTopController(WmWindow* root,
                                                 WmWindow* window) {
   return root->GetRootWindowController()
-      ->GetAlwaysOnTopController()
+      ->always_on_top_controller()
       ->GetContainer(window);
 }
 
 }  // namespace
 
 WmWindow* GetContainerForWindow(WmWindow* window) {
   WmWindow* parent = window->GetParent();
   // The first parent with an explicit shell window ID is the container.
   while (parent && parent->GetShellWindowId() == kShellWindowId_Invalid)
     parent = parent->GetParent();
@@ skipping 53 matching lines @@
     if (priority_root && priority_root->Contains(container))
       containers.insert(containers.begin(), container);
     else
       containers.push_back(container);
   }
   return containers;
 }
 
 }  // namespace wm
 }  // namespace ash