Moves mash/wm/public -> ash/public

ash/sysui/shelf_delegate_mus.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/sysui/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
@@ skipping 10 matching lines @@
 #include "components/mus/public/cpp/window_property.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "skia/public/type_converters.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/mus/window_manager_connection.h"
 
-using mash::wm::mojom::UserWindowController;
+using ash::mojom::UserWindowController;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
 // A ShelfItemDelegate used for pinned items and open user windows.
 class ShelfItemDelegateMus : public ShelfItemDelegate {
  public:
   explicit ShelfItemDelegateMus(UserWindowController* user_window_controller)
@@ skipping 305 matching lines @@
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id.To<std::string>()];
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_->ItemByID(shelf_id);
   item.image = GetShelfIconFromBitmap(image.To<SkBitmap>());
   model_->Set(index, item);
 }
 
 void ShelfDelegateMus::OnUserWindowObserverAdded(
-    mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) {
+    mojo::Array<mojom::UserWindowPtr> user_windows) {
   for (size_t i = 0; i < user_windows.size(); ++i)
     OnUserWindowAdded(std::move(user_windows[i]));
 }
 
-void ShelfDelegateMus::OnUserWindowAdded(
-    mash::wm::mojom::UserWindowPtr user_window) {
+void ShelfDelegateMus::OnUserWindowAdded(mojom::UserWindowPtr user_window) {
   DCHECK(!window_id_to_shelf_id_.count(user_window->window_id));
 
   if (user_window->ignored_by_shelf)
     return;
 
   std::string app_id(user_window->window_app_id.To<std::string>());
   if (app_id_to_shelf_id_.count(app_id)) {
     ShelfID shelf_id = app_id_to_shelf_id_[app_id];
     window_id_to_shelf_id_.insert(
         std::make_pair(user_window->window_id, shelf_id));
@@ skipping 100 matching lines @@
   StatusAreaWidget* status_widget = widget->status_area_widget();
   mus::Window* status_window =
       aura::GetMusWindow(status_widget->GetNativeWindow());
   gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
   status_window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, status_size);
 }
 
 }  // namespace sysui
 }  // namespace ash