mash: Move shelf model and item classes to ash/common/shelf

ash/common/shelf/shelf_model.cc

 // 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.
 
-#include "ash/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_model.h"
 
 #include <algorithm>
 
-#include "ash/ash_switches.h"
-#include "ash/shelf/shelf_model_observer.h"
+#include "ash/common/shelf/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int ShelfItemTypeToWeight(ShelfItemType type) {
   switch (type) {
     case TYPE_APP_LIST:
       // TODO(skuhne): If the app list item becomes movable again, this need
       // to be a fallthrough.
@@ skipping 149 matching lines @@
                                     CompareByWeight) - items_.begin(),
                    static_cast<ShelfItems::difference_type>(index));
   index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<ShelfItems::difference_type>(index));
 
   return index;
 }
 
 }  // namespace ash