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

Unified Diff: ui/aura/mus/in_flight_change.cc

Issue 2468493002: Fix bug in keeping capture in sync during destruction (Closed)
Patch Set: feedback Created 4 years, 1 month 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
« no previous file with comments | « ui/aura/mus/in_flight_change.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/in_flight_change.cc
diff --git a/ui/aura/mus/in_flight_change.cc b/ui/aura/mus/in_flight_change.cc
index 9d82fa9dfe1ca239b0c0d4ced126d335c214c258..52c7e51765327d28059f1bef422ae65a4bb571b2 100644
--- a/ui/aura/mus/in_flight_change.cc
+++ b/ui/aura/mus/in_flight_change.cc
@@ -5,6 +5,7 @@
#include "ui/aura/mus/in_flight_change.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/mus/capture_synchronizer.h"
#include "ui/aura/mus/window_mus.h"
#include "ui/aura/mus/window_port_mus.h"
#include "ui/aura/mus/window_tree_client.h"
@@ -112,16 +113,17 @@ void InFlightWindowTreeClientChange::OnWindowDestroyed(Window* window) {
// InFlightCaptureChange ------------------------------------------------------
-InFlightCaptureChange::InFlightCaptureChange(WindowTreeClient* client,
- WindowMus* revert_value)
- : InFlightWindowTreeClientChange(client,
- revert_value,
- ChangeType::CAPTURE) {}
+InFlightCaptureChange::InFlightCaptureChange(
+ WindowTreeClient* client,
+ CaptureSynchronizer* capture_synchronizer,
+ WindowMus* revert_value)
+ : InFlightWindowTreeClientChange(client, revert_value, ChangeType::CAPTURE),
+ capture_synchronizer_(capture_synchronizer) {}
InFlightCaptureChange::~InFlightCaptureChange() {}
void InFlightCaptureChange::Revert() {
- client()->SetCaptureFromServer(revert_window());
+ capture_synchronizer_->SetCaptureFromServer(revert_window());
}
// InFlightFocusChange --------------------------------------------------------
« no previous file with comments | « ui/aura/mus/in_flight_change.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698