mash: Fix ShelfItem mojo struct; add enums and traits.

ash/common/shelf/shelf_model.h

 // Copyright 2013 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.
 
 #ifndef ASH_COMMON_SHELF_SHELF_MODEL_H_
 #define ASH_COMMON_SHELF_SHELF_MODEL_H_
 
 #include <map>
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/public/cpp/shelf_item.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace ash {
 
 class ShelfModelObserver;
 
 // Model used for shelf items. Owns ShelfItemDelegates but does not create them.
 class ASH_EXPORT ShelfModel {
@@ skipping 80 matching lines @@
 
   std::map<ShelfID, std::unique_ptr<mojom::ShelfItemDelegate>>
       id_to_item_delegate_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfModel);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_MODEL_H_