Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/app_list_button.cc

 // Copyright 2014 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/app_list_button.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
@@ skipping 105 matching lines @@
   // resource and its icon file.
   int foreground_image_id = app_list::switches::IsExperimentalAppListEnabled()
                                 ? IDR_ASH_SHELF_ICON_APPLIST
                                 : IDR_ASH_SHELF_ICON_APPLIST_CLASSIC;
   const gfx::ImageSkia* forground_image =
       rb.GetImageNamed(foreground_image_id).ToImageSkia();
 
   gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect background_bounds, forground_bounds;
 
-  ShelfAlignment alignment = shelf_view_->shelf()->alignment();
+  wm::ShelfAlignment alignment = shelf_view_->shelf()->alignment();
   background_bounds.set_size(background_image->size());
-  if (alignment == SHELF_ALIGNMENT_LEFT) {
+  if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
     background_bounds.set_x(contents_bounds.width() -
         ShelfLayoutManager::kShelfItemInset - background_image->width());
     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
-  } else if(alignment == SHELF_ALIGNMENT_RIGHT) {
+  } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
     background_bounds.set_x(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
   } else {
     background_bounds.set_y(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_x(contents_bounds.x() +
         (contents_bounds.width() - background_image->width()) / 2);
   }
 
   forground_bounds.set_size(forground_image->size());
@@ skipping 21 matching lines @@
 
 void AppListButton::SetDrawBackgroundAsActive(
     bool draw_background_as_active) {
   if (draw_background_as_active_ == draw_background_as_active)
     return;
   draw_background_as_active_ = draw_background_as_active;
   SchedulePaint();
 }
 
 }  // namespace ash