Demonstrate external-window-mode in mus-demo

services/ui/display/platform_screen_ozone.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 "services/ui/display/platform_screen_ozone.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 49 matching lines @@
   fake_display_controller_ = nullptr;
   display_configurator_.RemoveObserver(this);
 }
 
 void PlatformScreenOzone::AddInterfaces(
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::DisplayController>(this);
   registry->AddInterface<mojom::TestDisplayController>(this);
 }
 
-void PlatformScreenOzone::Init(PlatformScreenDelegate* delegate) {
+void PlatformScreenOzone::Init(PlatformScreenDelegate* delegate,
+                               WindowMode window_mode) {
   DCHECK(delegate);
   delegate_ = delegate;
 
   std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate =
       ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
 
   // The FakeDisplayController gives us a way to make the NativeDisplayDelegate
   // pretend something display related has happened.
   if (!base::SysInfo::IsRunningOnChromeOS()) {

[Tom (Use chromium acct), 2016/11/28 20:47:38]

Does anyone know if this should also be wrapped with 
"if (window_mode == WINDOW_MODE_INTERNAL)"?

     fake_display_controller_ =
         native_display_delegate->GetFakeDisplayController();
   }
 
-  // We want display configuration to happen even off device to keep the control
-  // flow similar.
-  display_configurator_.set_configure_display(true);
-  display_configurator_.AddObserver(this);
-  display_configurator_.set_state_controller(this);
-  display_configurator_.Init(std::move(native_display_delegate), false);
-  display_configurator_.ForceInitialConfigure(kChromeOsBootColor);
+  if (window_mode == WINDOW_MODE_INTERNAL) {
+    // We want display configuration to happen even off device to keep the
+    // control flow similar.
+    display_configurator_.set_configure_display(true);
+    display_configurator_.AddObserver(this);
+    display_configurator_.set_state_controller(this);
+    display_configurator_.Init(std::move(native_display_delegate), false);
+    display_configurator_.ForceInitialConfigure(kChromeOsBootColor);
+  }
 }
 
 void PlatformScreenOzone::RequestCloseDisplay(int64_t display_id) {
   if (!fake_display_controller_ || wait_for_display_config_update_)
     return;
 
   CachedDisplayIterator iter = GetCachedDisplayIterator(display_id);
   if (iter != cached_displays_.end()) {
     // Tell the NDD to remove the display. PlatformScreen will get an update
     // that the display configuration has changed and the display will be gone.
@@ skipping 273 matching lines @@
   return false;
 }
 
 void PlatformScreenOzone::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display