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

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

Issue 2478383002: Remove SurfaceSequence from mus client code. (Closed)
Patch Set: Only cleanup. 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 unified diff | Download patch
« no previous file with comments | « ui/aura/mus/window_port_mus.cc ('k') | ui/aura/mus/window_tree_client.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 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 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 void OnWindowMusMoveChild(WindowMus* parent, 275 void OnWindowMusMoveChild(WindowMus* parent,
276 size_t current_index, 276 size_t current_index,
277 size_t dest_index); 277 size_t dest_index);
278 void OnWindowMusSetVisible(WindowMus* window, bool visible); 278 void OnWindowMusSetVisible(WindowMus* window, bool visible);
279 std::unique_ptr<WindowPortPropertyData> OnWindowMusWillChangeProperty( 279 std::unique_ptr<WindowPortPropertyData> OnWindowMusWillChangeProperty(
280 WindowMus* window, 280 WindowMus* window,
281 const void* key); 281 const void* key);
282 void OnWindowMusPropertyChanged(WindowMus* window, 282 void OnWindowMusPropertyChanged(WindowMus* window,
283 const void* key, 283 const void* key,
284 std::unique_ptr<WindowPortPropertyData> data); 284 std::unique_ptr<WindowPortPropertyData> data);
285 void OnWindowMusSurfaceDetached(WindowMus* window,
286 const cc::SurfaceSequence& sequence);
287 285
288 // Callback passed from WmPerformMoveLoop(). 286 // Callback passed from WmPerformMoveLoop().
289 void OnWmMoveLoopCompleted(uint32_t change_id, bool completed); 287 void OnWmMoveLoopCompleted(uint32_t change_id, bool completed);
290 288
291 // Overridden from WindowTreeClient: 289 // Overridden from WindowTreeClient:
292 void OnEmbed(ClientSpecificId client_id, 290 void OnEmbed(ClientSpecificId client_id,
293 ui::mojom::WindowDataPtr root, 291 ui::mojom::WindowDataPtr root,
294 ui::mojom::WindowTreePtr tree, 292 ui::mojom::WindowTreePtr tree,
295 int64_t display_id, 293 int64_t display_id,
296 Id focused_window_id, 294 Id focused_window_id,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 Id window_id, 334 Id window_id,
337 std::unique_ptr<ui::Event> event, 335 std::unique_ptr<ui::Event> event,
338 bool matches_pointer_watcher) override; 336 bool matches_pointer_watcher) override;
339 void OnPointerEventObserved(std::unique_ptr<ui::Event> event, 337 void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
340 uint32_t window_id) override; 338 uint32_t window_id) override;
341 void OnWindowFocused(Id focused_window_id) override; 339 void OnWindowFocused(Id focused_window_id) override;
342 void OnWindowPredefinedCursorChanged(Id window_id, 340 void OnWindowPredefinedCursorChanged(Id window_id,
343 ui::mojom::Cursor cursor) override; 341 ui::mojom::Cursor cursor) override;
344 void OnWindowSurfaceChanged(Id window_id, 342 void OnWindowSurfaceChanged(Id window_id,
345 const cc::SurfaceId& surface_id, 343 const cc::SurfaceId& surface_id,
346 const cc::SurfaceSequence& surface_sequence,
347 const gfx::Size& frame_size, 344 const gfx::Size& frame_size,
348 float device_scale_factor) override; 345 float device_scale_factor) override;
349 void OnDragDropStart( 346 void OnDragDropStart(
350 mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override; 347 mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override;
351 void OnDragEnter(Id window_id, 348 void OnDragEnter(Id window_id,
352 uint32_t event_flags, 349 uint32_t event_flags,
353 const gfx::Point& position, 350 const gfx::Point& position,
354 uint32_t effect_bitmask, 351 uint32_t effect_bitmask,
355 const OnDragEnterCallback& callback) override; 352 const OnDragEnterCallback& callback) override;
356 void OnDragOver(Id window_id, 353 void OnDragOver(Id window_id,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; 506 std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
510 507
511 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 508 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
512 509
513 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 510 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
514 }; 511 };
515 512
516 } // namespace aura 513 } // namespace aura
517 514
518 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 515 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_port_mus.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698