Getting rid of ChromeLauncherController::model().

ash/shelf/shelf.h

Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index a780fb3a7bb7c271f44c2341335ad666c7bff72f..97e082a731c38cc61e287413d9b69fdd2ab70035 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -11,6 +11,7 @@
 #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"
@@ -37,7 +38,6 @@ class FocusCycler;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfModel;
-class ShelfView;
 
 namespace wm {
 class WmShelfAura;
@@ -138,6 +138,8 @@ class ASH_EXPORT Shelf {
 
   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();