Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/system/status_area_widget_delegate.cc

Index: ash/system/status_area_widget_delegate.cc
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index bce3ef583e30e2880329c6e06890e5fd6a8f272c..6696b63d39462c0b564d3a82c75577193d9f0163 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -49,8 +49,7 @@ class StatusAreaWidgetDelegateAnimationSettings
 namespace ash {
 
 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
-    : focus_cycler_for_testing_(NULL),
-      alignment_(SHELF_ALIGNMENT_BOTTOM) {
+    : focus_cycler_for_testing_(NULL), alignment_(wm::SHELF_ALIGNMENT_BOTTOM) {

[James Cook, 2016/04/26 15:22:34]

nullptr while you're here

[sky, 2016/04/26 16:26:02]

Done.

   // Allow the launcher to surrender the focus to another window upon
   // navigation completion by the user.
   set_allow_deactivate_on_esc(true);