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

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

Issue 2617403003: Mus: Remove CompositorFrameSinkType (Closed)
Patch Set: Fix some unit tests Created 3 years, 11 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
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | ui/aura/test/mus/test_window_tree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 callback.Run(false); 272 callback.Run(false);
273 return; 273 return;
274 } 274 }
275 275
276 tree_->Embed(WindowMus::Get(window)->server_id(), std::move(client), flags, 276 tree_->Embed(WindowMus::Get(window)->server_id(), std::move(client), flags,
277 callback); 277 callback);
278 } 278 }
279 279
280 void WindowTreeClient::AttachCompositorFrameSink( 280 void WindowTreeClient::AttachCompositorFrameSink(
281 Id window_id, 281 Id window_id,
282 ui::mojom::CompositorFrameSinkType type,
283 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink, 282 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
284 cc::mojom::MojoCompositorFrameSinkClientPtr client) { 283 cc::mojom::MojoCompositorFrameSinkClientPtr client) {
285 DCHECK(tree_); 284 DCHECK(tree_);
286 tree_->AttachCompositorFrameSink( 285 tree_->AttachCompositorFrameSink(window_id, std::move(compositor_frame_sink),
287 window_id, type, std::move(compositor_frame_sink), std::move(client)); 286 std::move(client));
288 } 287 }
289 288
290 void WindowTreeClient::RegisterWindowMus(WindowMus* window) { 289 void WindowTreeClient::RegisterWindowMus(WindowMus* window) {
291 DCHECK(windows_.find(window->server_id()) == windows_.end()); 290 DCHECK(windows_.find(window->server_id()) == windows_.end());
292 windows_[window->server_id()] = window; 291 windows_[window->server_id()] = window;
293 } 292 }
294 293
295 WindowMus* WindowTreeClient::GetWindowByServerId(Id id) { 294 WindowMus* WindowTreeClient::GetWindowByServerId(Id id) {
296 IdToWindowMap::const_iterator it = windows_.find(id); 295 IdToWindowMap::const_iterator it = windows_.find(id);
297 return it != windows_.end() ? it->second : nullptr; 296 return it != windows_.end() ? it->second : nullptr;
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1694 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1693 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1695 this, capture_synchronizer_.get(), window)); 1694 this, capture_synchronizer_.get(), window));
1696 } 1695 }
1697 1696
1698 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1697 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1699 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1698 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1700 this, focus_synchronizer_.get(), window)); 1699 this, focus_synchronizer_.get(), window));
1701 } 1700 }
1702 1701
1703 } // namespace aura 1702 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | ui/aura/test/mus/test_window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698