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

ash/shelf/shelf_application_menu_model.cc

 // Copyright 2017 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/common/shelf/shelf_application_menu_model.h"
+#include "ash/shelf/shelf_application_menu_model.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <utility>
 
-#include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_application_menu_item.h"
+#include "ash/shelf/shelf_item_delegate.h"
 #include "base/metrics/histogram_macros.h"
 
 namespace {
 
 const int kInvalidCommandId = std::numeric_limits<int>::max();
 
 }  // namespace
 
 namespace ash {
 
@@ skipping 40 matching lines @@
 
 void ShelfApplicationMenuModel::RecordMenuItemSelectedMetrics(
     int command_id,
     int num_menu_items_enabled) {
   UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.Menu.SelectedMenuItemIndex", command_id);
   UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.Menu.NumItemsEnabledUponSelection",
                            num_menu_items_enabled);
 }
 
 }  // namespace ash