mash: Move ShelfModel* to ash/public/cpp.

ash/shelf/shelf_controller.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_CONTROLLER_H_
 #define ASH_SHELF_SHELF_CONTROLLER_H_
 
 #include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_model.h"
+#include "ash/public/cpp/shelf_model_observer.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/shelf.mojom.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_model_observer.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace ash {
 
 class Shelf;
 
 // Ash's ShelfController owns the ShelfModel and implements interface functions
 // that allow Chrome to modify and observe the Shelf and ShelfModel state.
 class ShelfController : public mojom::ShelfController,
@@ skipping 45 matching lines @@
 
   // The set of shelf observers notified about state and model changes.
   mojo::AssociatedInterfacePtrSet<mojom::ShelfObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_CONTROLLER_H_