Make Service own ServiceContext.

ash/mus/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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
     : public shell::Service,
       public shell::InterfaceFactory<mojom::ShelfLayout>,
       public shell::InterfaceFactory<mojom::UserWindowController>,
       public shell::InterfaceFactory<::ui::mojom::AcceleratorRegistrar>,
       public mash::session::mojom::ScreenlockStateListener,
       public WindowManagerObserver {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
-  shell::Connector* connector() { return connector_; }
-
   WindowManager* window_manager() { return window_manager_.get(); }
 
   mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   void InitWindowManager(::ui::WindowTreeClient* window_tree_client);
 
   // shell::Service:
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override;
+  void OnStart(const shell::Identity& identity) override;
   bool OnConnect(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<mojom::ShelfLayout>:
   void Create(const shell::Identity& remote_identity,
               mojo::InterfaceRequest<mojom::ShelfLayout> request) override;
 
   // shell::InterfaceFactory<mojom::UserWindowController>:
   void Create(
       const shell::Identity& remote_identity,
       mojo::InterfaceRequest<mojom::UserWindowController> request) override;
 
   // shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
   void Create(const shell::Identity& remote_identity,
               mojo::InterfaceRequest<::ui::mojom::AcceleratorRegistrar> request)
       override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
   // WindowManagerObserver:
   void OnRootWindowControllerAdded(RootWindowController* controller) override;
   void OnWillDestroyRootWindowController(
       RootWindowController* controller) override;
 
-  shell::Connector* connector_;
-
   mojo::TracingImpl tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
 
   // The |shelf_layout_| object is created once OnEmbed() is called. Until that
   // time |shelf_layout_requests_| stores pending interface requests.
   std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
   mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
   std::vector<mojo::InterfaceRequest<mojom::ShelfLayout>>
       shelf_layout_requests_;
@@ skipping 15 matching lines @@
   mojo::Binding<mash::session::mojom::ScreenlockStateListener>
       screenlock_state_listener_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_