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

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

Issue 2710023007: Make WindowTree::SetModal() take the type. (Closed)
Patch Set: Don't check for system modal when AddTransientWindow(). 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
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 UI_AURA_MUS_WINDOW_PORT_MUS_H_ 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 void OnDeviceScaleFactorChanged(float device_scale_factor) override; 227 void OnDeviceScaleFactorChanged(float device_scale_factor) override;
228 void OnWillAddChild(Window* child) override; 228 void OnWillAddChild(Window* child) override;
229 void OnWillRemoveChild(Window* child) override; 229 void OnWillRemoveChild(Window* child) override;
230 void OnWillMoveChild(size_t current_index, size_t dest_index) override; 230 void OnWillMoveChild(size_t current_index, size_t dest_index) override;
231 void OnVisibilityChanged(bool visible) override; 231 void OnVisibilityChanged(bool visible) override;
232 void OnDidChangeBounds(const gfx::Rect& old_bounds, 232 void OnDidChangeBounds(const gfx::Rect& old_bounds,
233 const gfx::Rect& new_bounds) override; 233 const gfx::Rect& new_bounds) override;
234 std::unique_ptr<ui::PropertyData> OnWillChangeProperty( 234 std::unique_ptr<ui::PropertyData> OnWillChangeProperty(
235 const void* key) override; 235 const void* key) override;
236 void OnPropertyChanged(const void* key, 236 void OnPropertyChanged(const void* key,
237 int64_t old_value,
237 std::unique_ptr<ui::PropertyData> data) override; 238 std::unique_ptr<ui::PropertyData> data) override;
238 239
239 WindowTreeClient* window_tree_client_; 240 WindowTreeClient* window_tree_client_;
240 241
241 Window* window_ = nullptr; 242 Window* window_ = nullptr;
242 243
243 // Used when this window is embedding a client. 244 // Used when this window is embedding a client.
244 std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder; 245 std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder;
245 246
246 ServerChangeIdType next_server_change_id_ = 0; 247 ServerChangeIdType next_server_change_id_ = 0;
247 ServerChanges server_changes_; 248 ServerChanges server_changes_;
248 249
249 cc::SurfaceInfo surface_info_; 250 cc::SurfaceInfo surface_info_;
250 251
251 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; 252 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
252 253
253 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); 254 DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
254 }; 255 };
255 256
256 } // namespace aura 257 } // namespace aura
257 258
258 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ 259 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698