Rename mash_shell to mash_session.

mash/wm/window_manager.cc

 // Copyright 2015 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/window_manager.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "components/mus/common/types.h"
@@ skipping 21 matching lines @@
   if (!root_controller_)
     return;
   for (auto container : root_controller_->root()->children()) {
     container->RemoveObserver(this);
     for (auto child : container->children())
       child->RemoveObserver(this);
   }
 }
 
 void WindowManager::Initialize(RootWindowController* root_controller,
-                               mash::shell::mojom::Shell* shell) {
+                               session::mojom::Session* session) {
   DCHECK(root_controller);
   DCHECK(!root_controller_);
   root_controller_ = root_controller;
   // The children of the root are considered containers.
   for (auto container : root_controller_->root()->children()) {
     container->AddObserver(this);
     for (auto child : container->children())
       child->AddObserver(this);
   }
 
   // The insets are roughly what is needed by CustomFrameView. The expectation
   // is at some point we'll write our own NonClientFrameView and get the insets
   // from it.
   mus::mojom::FrameDecorationValuesPtr frame_decoration_values =
       mus::mojom::FrameDecorationValues::New();
   const gfx::Insets client_area_insets =
       NonClientFrameController::GetPreferredClientAreaInsets();
   frame_decoration_values->normal_client_area_insets =
       mojo::Insets::From(client_area_insets);
   frame_decoration_values->maximized_client_area_insets =
       mojo::Insets::From(client_area_insets);
   frame_decoration_values->max_title_bar_button_width =
       NonClientFrameController::GetMaxTitleBarButtonWidth();
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
-  if (shell)
-    shell->AddScreenlockStateListener(binding_.CreateInterfacePtrAndBind());
+  if (session)
+    session->AddScreenlockStateListener(binding_.CreateInterfacePtrAndBind());
 }
 
 gfx::Rect WindowManager::CalculateDefaultBounds(mus::Window* window) const {
   DCHECK(root_controller_);
   int width, height;
   const gfx::Size pref = GetWindowPreferredSize(window);
   const mus::Window* root = root_controller_->root();
   if (pref.IsEmpty()) {
     width = root->bounds().width() - 240;
     height = root->bounds().height() - 240;
@@ skipping 86 matching lines @@
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash