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

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

Issue 2710023007: Make WindowTree::SetModal() take the type. (Closed)
Patch Set: address feedback. 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 | « 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr); 226 void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr);
227 227
228 // Called when the connection to the server is established. 228 // Called when the connection to the server is established.
229 void WindowTreeConnectionEstablished(ui::mojom::WindowTree* window_tree); 229 void WindowTreeConnectionEstablished(ui::mojom::WindowTree* window_tree);
230 230
231 // Called when the ui::mojom::WindowTree connection is lost, deletes this. 231 // Called when the ui::mojom::WindowTree connection is lost, deletes this.
232 void OnConnectionLost(); 232 void OnConnectionLost();
233 233
234 // Called when a Window property changes. If |key| is handled internally 234 // Called when a Window property changes. If |key| is handled internally
235 // (maps to a function on WindowTree) returns true. 235 // (maps to a function on WindowTree) returns true.
236 bool HandleInternalPropertyChanged(WindowMus* window, const void* key); 236 bool HandleInternalPropertyChanged(WindowMus* window,
237 const void* key,
238 int64_t old_value);
237 239
238 // OnEmbed() calls into this. Exposed as a separate function for testing. 240 // OnEmbed() calls into this. Exposed as a separate function for testing.
239 void OnEmbedImpl(ui::mojom::WindowTree* window_tree, 241 void OnEmbedImpl(ui::mojom::WindowTree* window_tree,
240 ClientSpecificId client_id, 242 ClientSpecificId client_id,
241 ui::mojom::WindowDataPtr root_data, 243 ui::mojom::WindowDataPtr root_data,
242 int64_t display_id, 244 int64_t display_id,
243 Id focused_window_id, 245 Id focused_window_id,
244 bool drawn); 246 bool drawn);
245 247
246 // Called by WmNewDisplayAdded(). 248 // Called by WmNewDisplayAdded().
(...skipping 27 matching lines...) Expand all
274 void OnWindowMusRemoveChild(WindowMus* parent, WindowMus* child); 276 void OnWindowMusRemoveChild(WindowMus* parent, WindowMus* child);
275 void OnWindowMusMoveChild(WindowMus* parent, 277 void OnWindowMusMoveChild(WindowMus* parent,
276 size_t current_index, 278 size_t current_index,
277 size_t dest_index); 279 size_t dest_index);
278 void OnWindowMusSetVisible(WindowMus* window, bool visible); 280 void OnWindowMusSetVisible(WindowMus* window, bool visible);
279 std::unique_ptr<ui::PropertyData> OnWindowMusWillChangeProperty( 281 std::unique_ptr<ui::PropertyData> OnWindowMusWillChangeProperty(
280 WindowMus* window, 282 WindowMus* window,
281 const void* key); 283 const void* key);
282 void OnWindowMusPropertyChanged(WindowMus* window, 284 void OnWindowMusPropertyChanged(WindowMus* window,
283 const void* key, 285 const void* key,
286 int64_t old_value,
284 std::unique_ptr<ui::PropertyData> data); 287 std::unique_ptr<ui::PropertyData> data);
285 288
286 // Callback passed from WmPerformMoveLoop(). 289 // Callback passed from WmPerformMoveLoop().
287 void OnWmMoveLoopCompleted(uint32_t change_id, bool completed); 290 void OnWmMoveLoopCompleted(uint32_t change_id, bool completed);
288 291
289 // Overridden from WindowTreeClient: 292 // Overridden from WindowTreeClient:
290 void OnEmbed(ClientSpecificId client_id, 293 void OnEmbed(ClientSpecificId client_id,
291 ui::mojom::WindowDataPtr root, 294 ui::mojom::WindowDataPtr root,
292 ui::mojom::WindowTreePtr tree, 295 ui::mojom::WindowTreePtr tree,
293 int64_t display_id, 296 int64_t display_id,
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 // ContextFactory that was set on Env originally. 548 // ContextFactory that was set on Env originally.
546 ui::ContextFactory* initial_context_factory_ = nullptr; 549 ui::ContextFactory* initial_context_factory_ = nullptr;
547 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 550 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
548 551
549 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 552 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
550 }; 553 };
551 554
552 } // namespace aura 555 } // namespace aura
553 556
554 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 557 #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