mash: Move ash/common/wm/shelf to ash/common/shelf

chrome/browser/ui/ash/chrome_launcher_prefs.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 CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
 #define CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
 
 #include <string>
 #include <vector>
 
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 
 class LauncherControllerHelper;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
@@ skipping 26 matching lines @@
 base::DictionaryValue* CreateAppDict(const std::string& app_id);
 
 // Get or set the shelf auto hide behavior preference for a particular display.
 ShelfAutoHideBehavior GetShelfAutoHideBehaviorPref(PrefService* prefs,
                                                    int64_t display_id);
 void SetShelfAutoHideBehaviorPref(PrefService* prefs,
                                   int64_t display_id,
                                   ShelfAutoHideBehavior behavior);
 
 // Get or set the shelf alignment preference for a particular display.
-wm::ShelfAlignment GetShelfAlignmentPref(PrefService* prefs,
-                                         int64_t display_id);
+ShelfAlignment GetShelfAlignmentPref(PrefService* prefs, int64_t display_id);
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
-                           wm::ShelfAlignment alignment);
+                           ShelfAlignment alignment);
 
 // Get the list of pinned apps from preferences.
 std::vector<std::string> GetPinnedAppsFromPrefs(
     const PrefService* prefs,
     const LauncherControllerHelper* helper);
 
 }  // namespace ash
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_