chromeos: Move files in //ash/common to //ash, part 2

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_COMMON_SHELF_SHELF_CONTROLLER_H_
-#define ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
+#ifndef ASH_SHELF_SHELF_CONTROLLER_H_
+#define ASH_SHELF_SHELF_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
-#include "ash/common/shelf/shelf_item_types.h"
-#include "ash/common/shelf/shelf_model.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/shelf.mojom.h"
+#include "ash/shelf/shelf_item_types.h"
+#include "ash/shelf/shelf_model.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace ash {
 
 class WmShelf;
 
 // Ash's implementation of the mojom::ShelfController interface. Chrome connects
 // to this interface to observe and manage the per-display ash shelf instances.
 class ShelfController : public mojom::ShelfController {
@@ skipping 41 matching lines @@
 
   // Mappings between application and shelf ids.
   std::map<std::string, ShelfID> app_id_to_shelf_id_;
   std::map<ShelfID, std::string> shelf_id_to_app_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfController);
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
+#endif  // ASH_SHELF_SHELF_CONTROLLER_H_