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

chrome/browser/ui/ash/chrome_launcher_prefs.cc

 // 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.
 
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 102 matching lines @@
   base::DictionaryValue* shelf_prefs = update.Get();
   base::DictionaryValue* pref_dictionary = nullptr;
   std::string key = base::Int64ToString(display_id);
   if (!shelf_prefs->GetDictionary(key, &pref_dictionary)) {
     pref_dictionary = new base::DictionaryValue();
     shelf_prefs->Set(key, pref_dictionary);
   }
   pref_dictionary->SetStringWithoutPathExpansion(pref_key, value);
 }
 
-wm::ShelfAlignment AlignmentFromPref(const std::string& value) {
+ShelfAlignment AlignmentFromPref(const std::string& value) {
   if (value == kShelfAlignmentLeft)
-    return wm::SHELF_ALIGNMENT_LEFT;
+    return SHELF_ALIGNMENT_LEFT;
   else if (value == kShelfAlignmentRight)
-    return wm::SHELF_ALIGNMENT_RIGHT;
+    return SHELF_ALIGNMENT_RIGHT;
   // Default to bottom.
-  return wm::SHELF_ALIGNMENT_BOTTOM;
+  return SHELF_ALIGNMENT_BOTTOM;
 }
 
-const char* AlignmentToPref(wm::ShelfAlignment alignment) {
+const char* AlignmentToPref(ShelfAlignment alignment) {
   switch (alignment) {
-    case wm::SHELF_ALIGNMENT_BOTTOM:
+    case SHELF_ALIGNMENT_BOTTOM:
       return kShelfAlignmentBottom;
-    case wm::SHELF_ALIGNMENT_LEFT:
+    case SHELF_ALIGNMENT_LEFT:
       return kShelfAlignmentLeft;
-    case wm::SHELF_ALIGNMENT_RIGHT:
+    case SHELF_ALIGNMENT_RIGHT:
       return kShelfAlignmentRight;
-    case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
+    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       // This should not be a valid preference option for now. We only want to
       // lock the shelf during login or when adding a user.
       return nullptr;
   }
   NOTREACHED();
   return nullptr;
 }
 
 ShelfAutoHideBehavior AutoHideBehaviorFromPref(const std::string& value) {
   // Note: To maintain sync compatibility with old images of chrome/chromeos
@@ skipping 109 matching lines @@
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAutoHideBehavior, value);
   if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| about why we have two prefs here.
     prefs->SetString(prefs::kShelfAutoHideBehaviorLocal, value);
     prefs->SetString(prefs::kShelfAutoHideBehavior, value);
   }
 }
 
-wm::ShelfAlignment GetShelfAlignmentPref(PrefService* prefs,
-                                         int64_t display_id) {
+ShelfAlignment GetShelfAlignmentPref(PrefService* prefs, int64_t display_id) {
   DCHECK_GE(display_id, 0);
 
   // See comment in |kShelfAlignment| as to why we consider two prefs.
   return AlignmentFromPref(GetPerDisplayPref(
       prefs, display_id, prefs::kShelfAlignmentLocal, prefs::kShelfAlignment));
 }
 
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
-                           wm::ShelfAlignment alignment) {
+                           ShelfAlignment alignment) {
   DCHECK_GE(display_id, 0);
 
   const char* value = AlignmentToPref(alignment);
   if (!value)
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAlignment, value);
   if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| as to why we consider two prefs.
     prefs->SetString(prefs::kShelfAlignmentLocal, value);
@@ skipping 88 matching lines @@
     apps.push_back(extension_misc::kChromeAppId);
 
   // If not added yet, place the app list item at the beginning of the list.
   if (std::find(apps.begin(), apps.end(), kPinnedAppsPlaceholder) == apps.end())
     apps.insert(apps.begin(), kPinnedAppsPlaceholder);
 
   return apps;
 }
 
 }  // namespace ash