Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/overflow_button.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/overflow_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 74 matching lines @@
   int background_image_id = 0;
   if (shelf_->IsShowingOverflowBubble())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
   else if (shelf_->shelf_widget()->GetDimsShelf())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
   else
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
 
   const gfx::ImageSkia* background =
       rb.GetImageNamed(background_image_id).ToImageSkia();
-  ShelfAlignment alignment = shelf_->alignment();
-  if (alignment == SHELF_ALIGNMENT_LEFT) {
+  wm::ShelfAlignment alignment = shelf_->alignment();
+  if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
     bounds = gfx::Rect(
         bounds.right() - background->width() -
             ShelfLayoutManager::kShelfItemInset,
         bounds.y() + (bounds.height() - background->height()) / 2,
         background->width(), background->height());
-  } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
+  } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
     bounds = gfx::Rect(
         bounds.x() + ShelfLayoutManager::kShelfItemInset,
         bounds.y() + (bounds.height() - background->height()) / 2,
         background->width(), background->height());
   } else {
     bounds = gfx::Rect(
         bounds.x() + (bounds.width() - background->width()) / 2,
         bounds.y() + ShelfLayoutManager::kShelfItemInset,
         background->width(), background->height());
   }
   canvas->DrawImageInt(*background, bounds.x(), bounds.y());
 
   if (height() < kButtonHoverSize)
     return;
 
   const gfx::ImageSkia* image = NULL;
 
   switch(alignment) {
-    case SHELF_ALIGNMENT_LEFT:
+    case wm::SHELF_ALIGNMENT_LEFT:
       if (left_image_.isNull()) {
         left_image_ = gfx::ImageSkiaOperations::CreateRotatedImage(
             *bottom_image_, SkBitmapOperations::ROTATION_90_CW);
       }
       image = &left_image_;
       break;
-    case SHELF_ALIGNMENT_RIGHT:
+    case wm::SHELF_ALIGNMENT_RIGHT:
       if (right_image_.isNull()) {
         right_image_ = gfx::ImageSkiaOperations::CreateRotatedImage(
             *bottom_image_, SkBitmapOperations::ROTATION_270_CW);
       }
       image = &right_image_;
       break;
     default:
       image = bottom_image_;
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace ash