Rename mash_shell to mash_session.

mash/screenlock/screenlock.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/screenlock/screenlock.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/property_type_converters.h"
-#include "mash/shell/public/interfaces/shell.mojom.h"
+#include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 31 matching lines @@
     bounds.set_height(bounds.height() - ps.height() - 10);
 
     unlock_button_->SetBounds(bounds.width() - ps.width(),
                               bounds.bottom() + 10,
                               ps.width(), ps.height());
   }
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK_EQ(sender, unlock_button_);
-    mash::shell::mojom::ShellPtr shell;
-    connector_->ConnectToInterface("mojo:mash_shell", &shell);
-    shell->UnlockScreen();
+    mash::session::mojom::SessionPtr session;
+    connector_->ConnectToInterface("mojo:mash_session", &session);
+    session->UnlockScreen();
   }
 
   mojo::Connector* connector_;
   views::LabelButton* unlock_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockView);
 };
 
 }  // namespace
 
 Screenlock::Screenlock() {}
 Screenlock::~Screenlock() {}
 
 void Screenlock::Initialize(mojo::Connector* connector,
                             const mojo::Identity& identity,
                             uint32_t id) {
   tracing_.Initialize(connector, identity.name());
 
-  mash::shell::mojom::ShellPtr mash_shell;
-  connector->ConnectToInterface("mojo:mash_shell", &mash_shell);
-  mash_shell->AddScreenlockStateListener(
+  mash::session::mojom::SessionPtr session;
+  connector->ConnectToInterface("mojo:mash_session", &session);
+  session->AddScreenlockStateListener(
       bindings_.CreateInterfacePtrAndBind(this));
 
   aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
   views::WindowManagerConnection::Create(connector);
 
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = new ScreenlockView(connector);
 
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[mash::wm::mojom::kWindowContainer_Property] =
       mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
           static_cast<int32_t>(mash::wm::mojom::Container::LOGIN_WINDOWS));
   mus::Window* window =
       views::WindowManagerConnection::Get()->NewWindow(properties);
   params.native_widget = new views::NativeWidgetMus(
       widget, connector, window, mus::mojom::SurfaceType::DEFAULT);
   widget->Init(params);
   widget->Show();
 }
 
 void Screenlock::ScreenlockStateChanged(bool screen_locked) {
   if (!screen_locked)
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace screenlock
 }  // namespace main