Rename mash_shell to mash_session.

mash/wm/window_manager_application.h

 // 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.
 
 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/shell/public/interfaces/shell.mojom.h"
+#include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 
 namespace ui {
 namespace mojo {
 class UIInit;
 }
@@ skipping 41 matching lines @@
   // Called when the root mus::Window of RootWindowController is destroyed.
   // |root_controller| is destroyed after this call.
   void OnRootWindowDestroyed(RootWindowController* root_controller);
 
   // TODO(sky): figure out right place for this code.
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
   void AddRootWindowsObserver(RootWindowsObserver* observer);
   void RemoveRootWindowsObserver(RootWindowsObserver* observer);
 
-  mash::shell::mojom::Shell* mash_shell() {
-    return mash_shell_.get();
+  session::mojom::Session* session() {
+    return session_.get();
   }
 
  private:
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   // mojo::ShellClient:
   void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
   void ShellConnectionLost() override;
@@ skipping 28 matching lines @@
   std::vector<
       scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>>
       user_window_controller_requests_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
   std::set<RootWindowController*> root_controllers_;
 
   mojo::Binding<mus::mojom::WindowManagerFactory>
       window_manager_factory_binding_;
 
-  mash::shell::mojom::ShellPtr mash_shell_;
+  mash::session::mojom::SessionPtr session_;
 
   base::ObserverList<RootWindowsObserver> root_windows_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_