chromeos: Rename ash::WmShelf to Shelf

ash/wm/panels/panel_window_resizer.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 "ash/wm/panels/panel_window_resizer.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/window_parenting_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ skipping 96 matching lines @@
 }
 
 bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
                                           gfx::Point* offset) {
   bool should_attach = false;
   if (panel_container_) {
     PanelLayoutManager* panel_layout_manager = GetPanelLayoutManager();
     gfx::Rect launcher_bounds =
         panel_layout_manager->shelf()->GetWindow()->GetBoundsInScreen();
     ::wm::ConvertRectFromScreen(GetTarget()->parent(), &launcher_bounds);
-    switch (panel_layout_manager->shelf()->GetAlignment()) {
+    switch (panel_layout_manager->shelf()->alignment()) {
       case SHELF_ALIGNMENT_BOTTOM:
       case SHELF_ALIGNMENT_BOTTOM_LOCKED:
         if (bounds.bottom() >=
             (launcher_bounds.y() - kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_y(launcher_bounds.y() - bounds.height() - bounds.y());
         }
         break;
       case SHELF_ALIGNMENT_LEFT:
         if (bounds.x() <=
@@ skipping 64 matching lines @@
     GetPanelLayoutManager()->shelf()->UpdateIconPositionForPanel(
         WmWindow::Get(GetTarget()));
   }
 }
 
 PanelLayoutManager* PanelWindowResizer::GetPanelLayoutManager() {
   return PanelLayoutManager::Get(panel_container_);
 }
 
 }  // namespace ash