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

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

Issue 2454973003: Wires up modality for aura-mus (Closed)
Patch Set: more tests 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/in_flight_change.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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 WindowMus* NewWindowFromWindowData( 240 WindowMus* NewWindowFromWindowData(
241 WindowMus* parent, 241 WindowMus* parent,
242 const ui::mojom::WindowDataPtr& window_data); 242 const ui::mojom::WindowDataPtr& window_data);
243 243
244 // Sets the ui::mojom::WindowTree implementation. 244 // Sets the ui::mojom::WindowTree implementation.
245 void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr); 245 void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr);
246 246
247 // Called when the ui::mojom::WindowTree connection is lost, deletes this. 247 // Called when the ui::mojom::WindowTree connection is lost, deletes this.
248 void OnConnectionLost(); 248 void OnConnectionLost();
249 249
250 // Called when a Window property changes. If |key| is handled internally
251 // (maps to a function on WindowTree) returns true.
252 bool HandleInternalPropertyChanged(WindowMus* window, const void* key);
253
250 // OnEmbed() calls into this. Exposed as a separate function for testing. 254 // OnEmbed() calls into this. Exposed as a separate function for testing.
251 void OnEmbedImpl(ui::mojom::WindowTree* window_tree, 255 void OnEmbedImpl(ui::mojom::WindowTree* window_tree,
252 ClientSpecificId client_id, 256 ClientSpecificId client_id,
253 ui::mojom::WindowDataPtr root_data, 257 ui::mojom::WindowDataPtr root_data,
254 int64_t display_id, 258 int64_t display_id,
255 Id focused_window_id, 259 Id focused_window_id,
256 bool drawn); 260 bool drawn);
257 261
258 // Called by WmNewDisplayAdded(). 262 // Called by WmNewDisplayAdded().
259 WindowTreeHost* WmNewDisplayAddedImpl(const display::Display& display, 263 WindowTreeHost* WmNewDisplayAddedImpl(const display::Display& display,
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 std::set<Id> drag_entered_windows_; 514 std::set<Id> drag_entered_windows_;
511 515
512 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 516 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
513 517
514 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 518 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
515 }; 519 };
516 520
517 } // namespace aura 521 } // namespace aura
518 522
519 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 523 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/in_flight_change.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698