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

ash/shell/window_watcher.h

 // Copyright (c) 2012 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_SHELL_WINDOW_WATCHER_H_
 #define ASH_SHELL_WINDOW_WATCHER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 
-#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/shelf/shelf_item_types.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 
 namespace aura {
 class Window;
 }
 
@@ skipping 32 matching lines @@
 
   std::unique_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
 };
 
 }  // namespace shell
 }  // namespace ash
 
 #endif  // ASH_SHELL_WINDOW_WATCHER_H_