mash: Move ash/common/wm/shelf to ash/common/shelf

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/common/shelf/shelf_types.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_menu_model.h"
 #include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 251 matching lines @@
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   observer_ptr->OnAlignmentChanged(
       static_cast<mash::shelf::mojom::Alignment>(shelf->alignment()));
   observer_ptr->OnAutoHideBehaviorChanged(
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
           shelf->auto_hide_behavior()));
   observers_.AddPtr(std::move(observer_ptr));
 }
 
 void ShelfDelegateMus::SetAlignment(mash::shelf::mojom::Alignment alignment) {
-  wm::ShelfAlignment value = static_cast<wm::ShelfAlignment>(alignment);
+  ShelfAlignment value = static_cast<ShelfAlignment>(alignment);
   Shelf::ForPrimaryDisplay()->SetAlignment(value);
 }
 
 void ShelfDelegateMus::SetAutoHideBehavior(
     mash::shelf::mojom::AutoHideBehavior auto_hide) {
   ShelfAutoHideBehavior value = static_cast<ShelfAutoHideBehavior>(auto_hide);
   Shelf::ForPrimaryDisplay()->SetAutoHideBehavior(value);
 }
 
 void ShelfDelegateMus::PinItem(
@@ skipping 174 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