Index: services/ui/public/cpp/window_tree_client.cc |
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc |
index eb96c58a4f0c97a462dd09ac09c009fcf89cda0d..bd8fdcbe65edf3bbe0487adad99e38a2610e0447 100644 |
--- a/services/ui/public/cpp/window_tree_client.cc |
+++ b/services/ui/public/cpp/window_tree_client.cc |
@@ -1057,7 +1057,8 @@ void WindowTreeClient::OnWindowSharedPropertyChanged( |
if (ApplyServerChangeToExistingInFlightChange(new_change)) |
return; |
- WindowPrivate(window).LocalSetSharedProperty(name, new_data); |
+ WindowPrivate(window).LocalSetSharedProperty(name, |
+ new_data ? &*new_data : nullptr); |
yzshen1
2017/01/06 19:38:38
nit: &new_data.value()?
Sam McNally
2017/01/09 23:15:15
Done.
|
} |
void WindowTreeClient::OnWindowInputEvent(uint32_t event_id, |