Move Mus into chrome's process when running with --mus.

services/ui/display/screen_manager_forwarding.h

 // Copyright 2017 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 SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_
 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_
 
 #include <memory>
 #include <unordered_map>
 #include <vector>
@@ skipping 12 matching lines @@
 
 class NativeDisplayDelegate;
 
 // ScreenManager implementation that implements mojom::NativeDisplayDelegate.
 // This will own a real NativeDisplayDelegate and forwards calls to and
 // responses from it over Mojo.
 class ScreenManagerForwarding : public ScreenManager,
                                 public NativeDisplayObserver,
                                 public mojom::NativeDisplayDelegate {
  public:
-  ScreenManagerForwarding();
+  // |in_process|  is true if the UI Service runs inside WM's process, false if

[sky, 2017/06/27 19:58:56]

optional: The boolean parameter isn't particularly obvious. Use an enum.

[mfomitchev, 2017/07/11 21:46:59]

Done.

+  // it runs inside its own process.
+  ScreenManagerForwarding(bool in_process);

[sky, 2017/06/27 19:58:56]

explicit

[mfomitchev, 2017/07/11 21:46:59]

Done.

   ~ScreenManagerForwarding() override;
 
   // ScreenManager:
   void AddInterfaces(service_manager::BinderRegistry* registry) override;
   void Init(ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override;
   display::ScreenBase* GetScreen() override;
 
   // NativeDisplayObserver:
   void OnConfigurationChanged() override;
@@ skipping 31 matching lines @@
                           const std::vector<DisplaySnapshot*>& displays);
 
   // Forwards results from call to Configure() back with |callback|.
   void ForwardConfigure(
       DisplaySnapshot* snapshot,
       const DisplayMode* mode,
       const gfx::Point& origin,
       const mojom::NativeDisplayDelegate::ConfigureCallback& callback,
       bool status);
 
+  // True if the UI Service runs inside WM's process, false if it runs inside
+  // its own process.
+  bool in_process_;

[sky, 2017/06/27 19:58:56]

const.

[mfomitchev, 2017/07/11 21:46:59]

Done.

   std::unique_ptr<display::ScreenBase> screen_;
   mojo::Binding<mojom::NativeDisplayDelegate> binding_;
   mojom::NativeDisplayObserverPtr observer_;
 
   std::unique_ptr<display::NativeDisplayDelegate> native_display_delegate_;
 
   // Cached pointers to snapshots owned by the |native_display_delegate_|.
   std::unordered_map<int64_t, DisplaySnapshot*> snapshot_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenManagerForwarding);
 };
 
 }  // namespace display
 
 #endif  // SERVICES_UI_DISPLAY_SCREEN_MANAGER_FORWARDING_H_