Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Unified Diff: services/ui/ws/window_manager_state.cc

Issue 2904993003: chromeos: changes how DisplayManagerObservers are notified (Closed)
Patch Set: cleanup Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/ui/ws/window_manager_state.cc
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index 6657f1500c52b9d070a88b1ef07e96d2023a9ba1..a0ff356f3d37f98a01193d4d3560b70d72e88751 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -13,6 +13,7 @@
#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"
@@ -154,9 +155,14 @@ 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,
« no previous file with comments | « services/ui/ws/user_display_manager_unittest.cc ('k') | services/ui/ws/window_manager_window_tree_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698