Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/shelf.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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_navigator.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/aura/wm_shelf_aura.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
              ShelfDelegate* shelf_delegate,
              ShelfWidget* shelf_widget)
     : delegate_(shelf_delegate),
       shelf_widget_(shelf_widget),
       shelf_view_(new ShelfView(shelf_model, delegate_, this)),
       shelf_locking_manager_(this) {
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
+  wm_shelf_.reset(new wm::WmShelfAura(this));

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

optional: Maybe comment why this has to be done at the end? I presume it's
because the shelf layout manager is initialized as one of the steps above.

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

Done.

 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
   return Shelf::ForWindow(Shell::GetPrimaryRootWindow());
 }
 
 // static
 Shelf* Shelf::ForWindow(const aura::Window* window) {
   ShelfWidget* shelf_widget = RootWindowController::ForWindow(window)->shelf();
   return shelf_widget ? shelf_widget->shelf() : nullptr;
 }
 
-void Shelf::SetAlignment(ShelfAlignment alignment) {
+void Shelf::SetAlignment(wm::ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
-      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+      alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }
 
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   shelf_widget_->OnShelfAlignmentChanged();
   delegate_->OnShelfAlignmentChanged(this);
   Shell::GetInstance()->OnShelfAlignmentChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
@@ skipping 118 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash