Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mash/shelf/shelf_model.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 "mash/shelf/shelf_model.h"
 
 #include <algorithm>
 
 #include "mash/shelf/shelf_model_observer.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace mash {
 namespace shelf {
 
 namespace {
 
 int ShelfItemTypeToWeight(ShelfItemType type) {
   switch (type) {
@@ skipping 20 matching lines @@
   NOTREACHED() << "Invalid type " << type;
   return 1;
 }
 
 bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
   return ShelfItemTypeToWeight(a.type) < ShelfItemTypeToWeight(b.type);
 }
 
 }  // namespace
 
-ShelfModel::ShelfModel(mojo::ApplicationImpl* app)
+ShelfModel::ShelfModel(mojo::Shell* shell)
     : next_id_(1), status_(STATUS_NORMAL), binding_(this) {
-  app->ConnectToService("mojo:desktop_wm", &user_window_controller_);
+  shell->ConnectToService("mojo:desktop_wm", &user_window_controller_);
   user_window_controller_->AddUserWindowObserver(
       binding_.CreateInterfacePtrAndBind());
 }
 
 ShelfModel::~ShelfModel() {
 }
 
 int ShelfModel::Add(const ShelfItem& item) {
   return AddAt(static_cast<int>(items_.size()), item);
 }
@@ skipping 168 matching lines @@
 int ShelfModel::ItemIndexByWindowID(uint32_t window_id) const {
   for (size_t i = 0; i < items_.size(); ++i) {
     if (items_[i].window_id == window_id)
       return static_cast<int>(i);
   }
   return -1;
 }
 
 }  // namespace shelf
 }  // namespace mash