Getting rid of ChromeLauncherController::model().

ash/shelf/shelf.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_locking_manager.h"
 #include "ash/shelf/shelf_types.h"
+#include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class View;
 }
 
 namespace ash {
 class FocusCycler;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfModel;
-class ShelfView;
 
 namespace wm {
 class WmShelfAura;
 }
 
 namespace test {
 class ShelfTestAPI;
 }
 
 // Controller for shelf state. All access to state (visibility, auto-hide, etc.)
@@ skipping 80 matching lines @@
   void SchedulePaint();
 
   views::View* GetAppListButtonView() const;
 
   // Launch a 0-indexed shelf item in the shelf.
   // A negative index launches the last shelf item in the shelf.
   void LaunchAppIndexAt(int item_index);
 
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
+  ShelfModel* shelf_model() { return shelf_view_->model(); }

[James Cook, 2016/06/04 04:47:58]

I don't understand why you're exposing this here, rather than calling
ash::Shell::shelf_model(). There is only one model for the shelf, shared among
multiple instances of this class. Doing it this way means every user of this
class directly depends on ShelfView.

If it has to be exposed here for some reason, maybe it could be a non-inline
function GetShelfModel() and we could sort out later whether it should get the
model directly from ash::Shell or inject a pointer or get it from ShelfView.

+
   // TODO(msw): ShelfLayoutManager should not be accessed externally.
   ShelfLayoutManager* shelf_layout_manager() {
     return shelf_widget_->shelf_layout_manager();
   }
 
   // Returns rectangle bounding all visible shelf items. Used screen coordinate
   // system.
   gfx::Rect GetVisibleItemsBoundsInScreen() const;
 
   // Returns ApplicationDragAndDropHost for this shelf.
@@ skipping 12 matching lines @@
 
   wm::ShelfAlignment alignment_ = wm::SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_