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

ash/shelf/shelf_window_watcher.h

 // 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.
 
-#ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
-#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
+#ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
+#define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace ash {
@@ skipping 93 matching lines @@
   ScopedObserver<aura::Window, UserWindowObserver> observed_user_windows_;
 
   // The set of windows with shelf items managed by this ShelfWindowWatcher.
   std::set<aura::Window*> user_windows_with_items_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
+#endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_