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

Side by Side Diff: ui/aura/mus/capture_synchronizer.cc

Issue 2626013005: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients. (Closed)
Patch Set: separate out changes for removing GetCaptureClient() Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/mus/capture_synchronizer.h" 5 #include "ui/aura/mus/capture_synchronizer.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "services/ui/public/interfaces/window_tree.mojom.h" 8 #include "services/ui/public/interfaces/window_tree.mojom.h"
9 #include "ui/aura/client/capture_client.h" 9 #include "ui/aura/client/capture_client.h"
10 #include "ui/aura/mus/capture_synchronizer_delegate.h" 10 #include "ui/aura/mus/capture_synchronizer_delegate.h"
11 #include "ui/aura/mus/window_mus.h" 11 #include "ui/aura/mus/window_mus.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 namespace aura { 14 namespace aura {
15 15
16 CaptureSynchronizer::CaptureSynchronizer(CaptureSynchronizerDelegate* delegate, 16 CaptureSynchronizer::CaptureSynchronizer(CaptureSynchronizerDelegate* delegate,
17 ui::mojom::WindowTree* window_tree, 17 ui::mojom::WindowTree* window_tree)
18 client::CaptureClient* capture_client) 18 : delegate_(delegate), window_tree_(window_tree) {}
19 : delegate_(delegate),
20 window_tree_(window_tree),
21 capture_client_(capture_client) {
22 capture_client_->AddObserver(this);
23 }
24 19
25 CaptureSynchronizer::~CaptureSynchronizer() { 20 CaptureSynchronizer::~CaptureSynchronizer() {}
26 SetCaptureWindow(nullptr);
27 capture_client_->RemoveObserver(this);
28 }
29 21
30 void CaptureSynchronizer::SetCaptureFromServer(WindowMus* window) { 22 void CaptureSynchronizer::SetCaptureFromServer(WindowMus* window) {
31 if (window == capture_window_) 23 if (window == capture_window_)
32 return; 24 return;
33 25
34 DCHECK(!setting_capture_); 26 DCHECK(!setting_capture_);
35 // Don't immediately set |capture_client_|. It's possible the change will be 27 // Don't immediately set capture client. It's possible the change will be
36 // rejected. 28 // rejected.
37 base::AutoReset<bool> capture_reset(&setting_capture_, true); 29 base::AutoReset<bool> capture_reset(&setting_capture_, true);
38 base::AutoReset<WindowMus*> window_setting_capture_to_reset( 30 base::AutoReset<WindowMus*> window_setting_capture_to_reset(
39 &window_setting_capture_to_, window); 31 &window_setting_capture_to_, window);
40 capture_client_->SetCapture(window ? window->GetWindow() : nullptr); 32 client::CaptureClient* capture_client =
33 window ? client::GetCaptureClient(window->GetWindow()->GetRootWindow())
34 : client::GetCaptureClient(
35 capture_window_->GetWindow()->GetRootWindow());
36 capture_client->SetCapture(window ? window->GetWindow() : nullptr);
41 } 37 }
42 38
43 void CaptureSynchronizer::SetCaptureWindow(WindowMus* window) { 39 void CaptureSynchronizer::SetCaptureWindow(WindowMus* window) {
44 if (capture_window_) 40 if (capture_window_)
45 capture_window_->GetWindow()->RemoveObserver(this); 41 capture_window_->GetWindow()->RemoveObserver(this);
46 capture_window_ = window; 42 capture_window_ = window;
47 if (capture_window_) 43 if (capture_window_)
48 capture_window_->GetWindow()->AddObserver(this); 44 capture_window_->GetWindow()->AddObserver(this);
49 } 45 }
50 46
(...skipping 21 matching lines...) Expand all
72 delegate_->CreateChangeIdForCapture(capture_window_); 68 delegate_->CreateChangeIdForCapture(capture_window_);
73 WindowMus* old_capture_window = capture_window_; 69 WindowMus* old_capture_window = capture_window_;
74 SetCaptureWindow(gained_capture_mus); 70 SetCaptureWindow(gained_capture_mus);
75 if (capture_window_) 71 if (capture_window_)
76 window_tree_->SetCapture(change_id, capture_window_->server_id()); 72 window_tree_->SetCapture(change_id, capture_window_->server_id());
77 else 73 else
78 window_tree_->ReleaseCapture(change_id, old_capture_window->server_id()); 74 window_tree_->ReleaseCapture(change_id, old_capture_window->server_id());
79 } 75 }
80 76
81 } // namespace aura 77 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698