Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/system/web_notification/ash_popup_alignment_delegate.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/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 80 matching lines @@
 
 int AshPopupAlignmentDelegate::GetWorkAreaBottom() const {
   return work_area_.bottom() - system_tray_height_;
 }
 
 bool AshPopupAlignmentDelegate::IsTopDown() const {
   return false;
 }
 
 bool AshPopupAlignmentDelegate::IsFromLeft() const {
-  return GetAlignment() == SHELF_ALIGNMENT_LEFT;
+  return GetAlignment() == wm::SHELF_ALIGNMENT_LEFT;
 }
 
 void AshPopupAlignmentDelegate::RecomputeAlignment(
     const gfx::Display& display) {
   // Nothing needs to be done.
 }
 
-ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
+wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }
 
 gfx::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
   return gfx::Screen::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea() {
   work_area_ = shelf_->user_work_area_bounds();
@@ skipping 23 matching lines @@
 }
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const gfx::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();
 }
 
 }  // namespace ash