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

Side by Side Diff: services/ui/ws/test_utils.h

Issue 2764433003: mus-ws: Plumb FrameSinkId to Children (Closed)
Patch Set: Addressed Antoine's comment Created 3 years, 9 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 | « services/ui/ws/test_change_tracker.cc ('k') | services/ui/ws/test_utils.cc » ('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 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 #ifndef SERVICES_UI_WS_TEST_UTILS_H_ 5 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
6 #define SERVICES_UI_WS_TEST_UTILS_H_ 6 #define SERVICES_UI_WS_TEST_UTILS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 uint32_t on_accelerator_id() { return on_accelerator_id_; } 316 uint32_t on_accelerator_id() { return on_accelerator_id_; }
317 bool got_display_removed() const { return got_display_removed_; } 317 bool got_display_removed() const { return got_display_removed_; }
318 int64_t display_removed_id() const { return display_removed_id_; } 318 int64_t display_removed_id() const { return display_removed_id_; }
319 bool on_set_modal_type_called() { return on_set_modal_type_called_; } 319 bool on_set_modal_type_called() { return on_set_modal_type_called_; }
320 320
321 private: 321 private:
322 // WindowManager: 322 // WindowManager:
323 void OnConnect(uint16_t client_id) override {} 323 void OnConnect(uint16_t client_id) override {}
324 void WmNewDisplayAdded(const display::Display& display, 324 void WmNewDisplayAdded(const display::Display& display,
325 ui::mojom::WindowDataPtr root, 325 ui::mojom::WindowDataPtr root,
326 bool drawn) override {} 326 bool drawn,
327 const cc::FrameSinkId& frame_sink_id) override {}
327 void WmDisplayRemoved(int64_t display_id) override; 328 void WmDisplayRemoved(int64_t display_id) override;
328 void WmDisplayModified(const display::Display& display) override {} 329 void WmDisplayModified(const display::Display& display) override {}
329 void WmSetBounds(uint32_t change_id, 330 void WmSetBounds(uint32_t change_id,
330 uint32_t window_id, 331 uint32_t window_id,
331 const gfx::Rect& bounds) override {} 332 const gfx::Rect& bounds) override {}
332 void WmSetProperty( 333 void WmSetProperty(
333 uint32_t change_id, 334 uint32_t change_id,
334 uint32_t window_id, 335 uint32_t window_id,
335 const std::string& name, 336 const std::string& name,
336 const base::Optional<std::vector<uint8_t>>& value) override {} 337 const base::Optional<std::vector<uint8_t>>& value) override {}
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 record_on_change_completed_ = value; 388 record_on_change_completed_ = value;
388 } 389 }
389 390
390 private: 391 private:
391 // WindowTreeClient: 392 // WindowTreeClient:
392 void OnEmbed(uint16_t client_id, 393 void OnEmbed(uint16_t client_id,
393 mojom::WindowDataPtr root, 394 mojom::WindowDataPtr root,
394 ui::mojom::WindowTreePtr tree, 395 ui::mojom::WindowTreePtr tree,
395 int64_t display_id, 396 int64_t display_id,
396 Id focused_window_id, 397 Id focused_window_id,
397 bool drawn) override; 398 bool drawn,
399 const cc::FrameSinkId& frame_sink_id) override;
398 void OnEmbeddedAppDisconnected(uint32_t window) override; 400 void OnEmbeddedAppDisconnected(uint32_t window) override;
399 void OnUnembed(Id window_id) override; 401 void OnUnembed(Id window_id) override;
400 void OnCaptureChanged(Id new_capture_window_id, 402 void OnCaptureChanged(Id new_capture_window_id,
401 Id old_capture_window_id) override; 403 Id old_capture_window_id) override;
402 void OnTopLevelCreated(uint32_t change_id, 404 void OnTopLevelCreated(uint32_t change_id,
403 mojom::WindowDataPtr data, 405 mojom::WindowDataPtr data,
404 int64_t display_id, 406 int64_t display_id,
405 bool drawn) override; 407 bool drawn,
408 const cc::FrameSinkId& frame_sink_id) override;
406 void OnWindowBoundsChanged( 409 void OnWindowBoundsChanged(
407 uint32_t window, 410 uint32_t window,
408 const gfx::Rect& old_bounds, 411 const gfx::Rect& old_bounds,
409 const gfx::Rect& new_bounds, 412 const gfx::Rect& new_bounds,
410 const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; 413 const base::Optional<cc::LocalSurfaceId>& local_surface_id) override;
411 void OnClientAreaChanged( 414 void OnClientAreaChanged(
412 uint32_t window_id, 415 uint32_t window_id,
413 const gfx::Insets& new_client_area, 416 const gfx::Insets& new_client_area,
414 const std::vector<gfx::Rect>& new_additional_client_areas) override; 417 const std::vector<gfx::Rect>& new_additional_client_areas) override;
415 void OnTransientWindowAdded(uint32_t window_id, 418 void OnTransientWindowAdded(uint32_t window_id,
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); 677 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
675 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, 678 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
676 ServerWindow* parent, 679 ServerWindow* parent,
677 ClientWindowId* client_id = nullptr); 680 ClientWindowId* client_id = nullptr);
678 681
679 } // namespace test 682 } // namespace test
680 } // namespace ws 683 } // namespace ws
681 } // namespace ui 684 } // namespace ui
682 685
683 #endif // SERVICES_UI_WS_TEST_UTILS_H_ 686 #endif // SERVICES_UI_WS_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « services/ui/ws/test_change_tracker.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698