Rename mash_shell to mash_session.

mash/wm/root_window_controller.cc

 // Copyright 2016 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/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
-#include "mash/shell/public/interfaces/shell.mojom.h"
+#include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/fill_layout.h"
 #include "mash/wm/screenlock_layout.h"
 #include "mash/wm/shadow_controller.h"
 #include "mash/wm/shelf_layout.h"
 #include "mash/wm/window_layout.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/shell/public/cpp/connector.h"
 
@@ skipping 99 matching lines @@
   layout_manager_[login_app].reset(new ScreenlockLayout(login_app));
   mus::Window* user_shelf = GetWindowForContainer(mojom::Container::USER_SHELF);
   layout_manager_[user_shelf].reset(new ShelfLayout(user_shelf));
 
   mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
   layout_manager_[window].reset(new WindowLayout(window));
   window_manager_client()->AddActivationParent(window);
 
   AddAccelerators();
 
-  window_manager_->Initialize(this, app_->mash_shell());
+  window_manager_->Initialize(this, app_->session());
 
   shadow_controller_.reset(new ShadowController(root->connection()));
 
   app_->OnRootWindowControllerDoneInit(this);
 }
 
 void RootWindowController::OnConnectionLost(
     mus::WindowTreeConnection* connection) {
   shadow_controller_.reset();
   delete this;
@@ skipping 49 matching lines @@
                   mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash