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

ash/shelf/shelf_window_watcher_item_delegate.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_window_watcher_item_delegate.h"
 
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shelf/shelf_controller.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_constants.h"
 
 namespace ash {
 
 namespace {
 
 ShelfItemType GetShelfItemType(ShelfID id) {
   ShelfModel* model = WmShell::Get()->shelf_controller()->model();
   ShelfItems::const_iterator item = model->ItemByID(id);
@@ skipping 46 matching lines @@
                                                     int event_flags) {
   // This delegate does not support showing an application menu.
   NOTIMPLEMENTED();
 }
 
 void ShelfWindowWatcherItemDelegate::Close() {
   window_->CloseWidget();
 }
 
 }  // namespace ash