Demonstrate external-window-mode in mus-demo

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 48 matching lines @@
   int64_t AddDisplay(const display::ViewportMetrics& metrics);
 
   // Calls OnDisplayModified() on delegate.
   void ModifyDisplay(int64_t id, const display::ViewportMetrics& metrics);
 
   // Calls OnDisplayRemoved() on delegate.
   void RemoveDisplay(int64_t id);
 
   // display::PlatformScreen:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
-  void Init(display::PlatformScreenDelegate* delegate) override;
+  void Init(display::PlatformScreenDelegate* delegate,
+            bool external_window_mode_) override;

[tonikitoo, 2016/11/22 03:07:39]

nit: trailing "_"

[Tom (Use chromium acct), 2016/11/22 19:19:48]

Done.

   void RequestCloseDisplay(int64_t display_id) override {}
   int64_t GetPrimaryDisplayId() const override;
 
  private:
   display::PlatformScreenDelegate* delegate_;
   int64_t primary_display_id_ = display::Display::kInvalidDisplayID;
   std::set<int64_t> display_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
 };
@@ skipping 476 matching lines @@
   }
   TestWindowTreeBinding* last_binding() {
     return bindings_.empty() ? nullptr : bindings_.back();
   }
 
   std::vector<TestWindowTreeBinding*>* bindings() { return &bindings_; }
 
   bool got_on_no_more_displays() const { return got_on_no_more_displays_; }
 
   // WindowServerDelegate:
-  void StartDisplayInit() override;
+  void StartDisplayInit(bool window_manager_connected) override;
   void OnNoMoreDisplays() override;
   std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding(
       BindingType type,
       ws::WindowServer* window_server,
       ws::WindowTree* tree,
       mojom::WindowTreeRequest* tree_request,
       mojom::WindowTreeClientPtr* client) override;
   bool IsTestConfig() const override;
   void UpdateTouchTransforms() override {}
 
@@ skipping 116 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_