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

ash/common/shelf/shelf_model.h

Index: ash/common/shelf/shelf_model.h
diff --git a/ash/shelf/shelf_model.h b/ash/common/shelf/shelf_model.h
similarity index 95%
rename from ash/shelf/shelf_model.h
rename to ash/common/shelf/shelf_model.h
index 727e23fad5bc42b492a7a7cdbd5297dc1f485f71..a5f61e806ae84da5612fcdfb6c42fff62ea72da3 100644
--- a/ash/shelf/shelf_model.h
+++ b/ash/common/shelf/shelf_model.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SHELF_SHELF_MODEL_H_
-#define ASH_SHELF_SHELF_MODEL_H_
+#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/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
@@ -108,4 +108,4 @@ class ASH_EXPORT ShelfModel {
 
 }  // namespace ash
 
-#endif  // ASH_SHELF_SHELF_MODEL_H_
+#endif  // ASH_COMMON_SHELF_SHELF_MODEL_H_