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

ash/shelf/shelf_locking_manager.h

Index: ash/shelf/shelf_locking_manager.h
diff --git a/ash/common/shelf/shelf_locking_manager.h b/ash/shelf/shelf_locking_manager.h
similarity index 87%
rename from ash/common/shelf/shelf_locking_manager.h
rename to ash/shelf/shelf_locking_manager.h
index 2bf015e7f996e3865d2ed263b505a00c0beddf4b..b40e2bb918a05abe4a47aa668128e580d23d4121 100644
--- a/ash/common/shelf/shelf_locking_manager.h
+++ b/ash/shelf/shelf_locking_manager.h
@@ -2,14 +2,14 @@
 // 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_LOCKING_MANAGER_H_
-#define ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_
+#ifndef ASH_SHELF_SHELF_LOCKING_MANAGER_H_
+#define ASH_SHELF_SHELF_LOCKING_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shell_observer.h"
-#include "ash/common/wm/lock_state_observer.h"
 #include "ash/public/cpp/shelf_types.h"
+#include "ash/wm/lock_state_observer.h"
 
 namespace ash {
 
@@ -49,4 +49,4 @@ class ASH_EXPORT ShelfLockingManager : public ShellObserver,
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_
+#endif  // ASH_SHELF_SHELF_LOCKING_MANAGER_H_