ash: Refactor Shelf ownership and ShelfView creation

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/aura/wm_window_aura.h"
@@ skipping 14 matching lines @@
 #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,
-             WmShelf* wm_shelf,
+Shelf::Shelf(WmShelf* wm_shelf,
+             ShelfView* shelf_view,
              ShelfWidget* shelf_widget)
     : wm_shelf_(wm_shelf),
       shelf_widget_(shelf_widget),
-      shelf_view_(new ShelfView(shelf_model,
-                                WmShell::Get()->shelf_delegate(),
-                                wm_shelf,
-                                shelf_widget)),
+      shelf_view_(shelf_view),

[James Cook, 2016/08/12 22:00:47]

I'd like to eliminate this member, but it's a bit much to do in this CL.

[msw, 2016/08/12 22:39:53]

Acknowledged.

       shelf_locking_manager_(wm_shelf) {
   DCHECK(wm_shelf_);
-  shelf_view_->Init();
-  shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
-  shelf_widget_->GetNativeView()->SetName(kNativeViewName);
+  DCHECK(shelf_view_);
+  DCHECK(shelf_widget_);
 }
 
 Shelf::~Shelf() {
   WmShell::Get()->shelf_delegate()->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
   return Shelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow());
 }
@@ skipping 61 matching lines @@
           .CenterPoint());
 }
 
 void Shelf::ActivateShelfItem(int index) {
   // We pass in a keyboard event which will then trigger a switch to the
   // next item if the current one is already active.
   ui::KeyEvent event(ui::ET_KEY_RELEASED,
                      ui::VKEY_UNKNOWN,  // The actual key gets ignored.
                      ui::EF_NONE);
 
-  const ShelfItem& item = shelf_view_->model()->items()[index];
-  ShelfItemDelegate* item_delegate =
-      shelf_view_->model()->GetShelfItemDelegate(item.id);
+  ShelfModel* shelf_model = WmShell::Get()->shelf_model();
+  const ShelfItem& item = shelf_model->items()[index];
+  ShelfItemDelegate* item_delegate = shelf_model->GetShelfItemDelegate(item.id);
   item_delegate->ItemSelected(event);
 }
 
 void Shelf::CycleWindowLinear(CycleDirection direction) {
   int item_index =
-      GetNextActivatedItemIndex(*(shelf_view_->model()), direction);
+      GetNextActivatedItemIndex(*WmShell::Get()->shelf_model(), direction);
   if (item_index >= 0)
     ActivateShelfItem(item_index);
 }
 
 void Shelf::AddIconObserver(ShelfIconObserver* observer) {
   shelf_view_->AddIconObserver(observer);
 }
 
 void Shelf::RemoveIconObserver(ShelfIconObserver* observer) {
   shelf_view_->RemoveIconObserver(observer);
 }
 
 bool Shelf::IsShowingMenu() const {
   return shelf_view_->IsShowingMenu();
 }
 
 bool Shelf::IsShowingOverflowBubble() const {
   return shelf_view_->IsShowingOverflowBubble();
 }
 
-void Shelf::SetVisible(bool visible) const {
-  shelf_view_->SetVisible(visible);
-}
-
 bool Shelf::IsVisible() const {
   return shelf_view_->visible();
 }
 
 void Shelf::SchedulePaint() {
   shelf_view_->SchedulePaintForAllButtons();
 }
 
 AppListButton* Shelf::GetAppListButton() const {
   return shelf_view_->GetAppListButton();
 }
 
 void Shelf::LaunchAppIndexAt(int item_index) {
-  ShelfModel* shelf_model = shelf_view_->model();
+  ShelfModel* shelf_model = WmShell::Get()->shelf_model();
   const ShelfItems& items = shelf_model->items();
   int item_count = shelf_model->item_count();
   int indexes_left = item_index >= 0 ? item_index : item_count;
   int found_index = -1;
 
   // Iterating until we have hit the index we are interested in which
   // is true once indexes_left becomes negative.
   for (int i = 0; i < item_count && indexes_left >= 0; i++) {
     if (items[i].type != TYPE_APP_LIST) {
       found_index = i;
@@ skipping 16 matching lines @@
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 void Shelf::UpdateShelfItemBackground(int alpha) {
   shelf_view_->UpdateShelfItemBackground(alpha);
 }
 
 }  // namespace ash