chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_bezel_event_handler.cc

 // 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.
 
 #include "ash/shelf/shelf_bezel_event_handler.h"
 
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
-ShelfBezelEventHandler::ShelfBezelEventHandler(WmShelf* shelf)
+ShelfBezelEventHandler::ShelfBezelEventHandler(Shelf* shelf)
     : shelf_(shelf), in_touch_drag_(false) {
   Shell::Get()->AddPreTargetHandler(this);
 }
 
 ShelfBezelEventHandler::~ShelfBezelEventHandler() {
   Shell::Get()->RemovePreTargetHandler(this);
 }
 
 void ShelfBezelEventHandler::OnGestureEvent(ui::GestureEvent* event) {
   gfx::Point point_in_screen(event->location());
@@ skipping 17 matching lines @@
         default:
           break;
       }
       event->StopPropagation();
     }
   }
 }
 
 bool ShelfBezelEventHandler::IsShelfOnBezel(const gfx::Rect& screen,
                                             const gfx::Point& point) const {
-  switch (shelf_->GetAlignment()) {
+  switch (shelf_->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return point.y() >= screen.bottom();
     case SHELF_ALIGNMENT_LEFT:
       return point.x() <= screen.x();
     case SHELF_ALIGNMENT_RIGHT:
       return point.x() >= screen.right();
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace ash