chromeos: changes how DisplayManagerObservers are notified

services/ui/ws/window_manager_state.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/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/ws/accelerator.h"
 #include "services/ui/ws/cursor_location_manager.h"
 #include "services/ui/ws/display.h"
+#include "services/ui/ws/display_creation_config.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_tree.h"
 #include "ui/events/event.h"
 
@@ skipping 121 matching lines @@
   if (window_tree_->automatically_create_display_roots()) {
     for (auto& display_root : orphaned_window_manager_display_roots_)
       display_root->root()->RemoveObserver(this);
   }
 }
 
 void WindowManagerState::SetFrameDecorationValues(
     mojom::FrameDecorationValuesPtr values) {
   got_frame_decoration_values_ = true;
   frame_decoration_values_ = values.Clone();
-  display_manager()
-      ->GetUserDisplayManager(user_id())
-      ->OnFrameDecorationValuesChanged();
+  UserDisplayManager* user_display_manager =
+      display_manager()->GetUserDisplayManager(user_id());
+  user_display_manager->OnFrameDecorationValuesChanged();
+  if (window_server()->display_creation_config() ==
+          DisplayCreationConfig::MANUAL &&
+      display_manager()->got_initial_config_from_window_manager()) {
+    user_display_manager->CallOnDisplaysChanged();
+  }
 }
 
 bool WindowManagerState::SetCapture(ServerWindow* window,
                                     ClientSpecificId client_id) {
   DCHECK(IsActive());
   if (capture_window() == window &&
       client_id == event_dispatcher_.capture_window_client_id()) {
     return true;
   }
 #if DCHECK_IS_ON()
@@ skipping 543 matching lines @@
       window->RemoveObserver(this);
       orphaned_window_manager_display_roots_.erase(iter);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace ws
 }  // namespace ui