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

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

Issue 2456623002: Fixes to WindowTreeHostMus (Closed)
Patch Set: merge 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/BUILD.gn ('k') | ui/aura/mus/in_flight_change.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_IN_FLIGHT_CHANGE_H_ 5 #ifndef UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // outstanding, revert the value. 130 // outstanding, revert the value.
131 virtual void Revert() = 0; 131 virtual void Revert() = 0;
132 132
133 private: 133 private:
134 WindowMus* window_; 134 WindowMus* window_;
135 const ChangeType change_type_; 135 const ChangeType change_type_;
136 }; 136 };
137 137
138 class InFlightBoundsChange : public InFlightChange { 138 class InFlightBoundsChange : public InFlightChange {
139 public: 139 public:
140 InFlightBoundsChange(WindowMus* window, const gfx::Rect& revert_bounds); 140 InFlightBoundsChange(WindowTreeClient* window_tree_client,
141 WindowMus* window,
142 const gfx::Rect& revert_bounds);
141 143
142 // InFlightChange: 144 // InFlightChange:
143 void SetRevertValueFrom(const InFlightChange& change) override; 145 void SetRevertValueFrom(const InFlightChange& change) override;
144 void Revert() override; 146 void Revert() override;
145 147
146 private: 148 private:
149 WindowTreeClient* window_tree_client_;
147 gfx::Rect revert_bounds_; 150 gfx::Rect revert_bounds_;
148 151
149 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange); 152 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange);
150 }; 153 };
151 154
152 class InFlightDragChange : public InFlightChange { 155 class InFlightDragChange : public InFlightChange {
153 public: 156 public:
154 InFlightDragChange(WindowMus* window, ChangeType type); 157 InFlightDragChange(WindowMus* window, ChangeType type);
155 158
156 // InFlightChange: 159 // InFlightChange:
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 void Revert() override; 267 void Revert() override;
265 268
266 private: 269 private:
267 ui::mojom::Cursor revert_cursor_; 270 ui::mojom::Cursor revert_cursor_;
268 271
269 DISALLOW_COPY_AND_ASSIGN(InFlightPredefinedCursorChange); 272 DISALLOW_COPY_AND_ASSIGN(InFlightPredefinedCursorChange);
270 }; 273 };
271 274
272 class InFlightVisibleChange : public InFlightChange { 275 class InFlightVisibleChange : public InFlightChange {
273 public: 276 public:
274 InFlightVisibleChange(WindowMus* window, const bool revert_value); 277 InFlightVisibleChange(WindowTreeClient* client,
278 WindowMus* window,
279 const bool revert_value);
275 ~InFlightVisibleChange() override; 280 ~InFlightVisibleChange() override;
276 281
277 // InFlightChange: 282 // InFlightChange:
278 void SetRevertValueFrom(const InFlightChange& change) override; 283 void SetRevertValueFrom(const InFlightChange& change) override;
279 void Revert() override; 284 void Revert() override;
280 285
281 private: 286 private:
287 WindowTreeClient* window_tree_client_;
282 bool revert_visible_; 288 bool revert_visible_;
283 289
284 DISALLOW_COPY_AND_ASSIGN(InFlightVisibleChange); 290 DISALLOW_COPY_AND_ASSIGN(InFlightVisibleChange);
285 }; 291 };
286 292
287 class InFlightOpacityChange : public InFlightChange { 293 class InFlightOpacityChange : public InFlightChange {
288 public: 294 public:
289 InFlightOpacityChange(WindowMus* window, float revert_value); 295 InFlightOpacityChange(WindowMus* window, float revert_value);
290 ~InFlightOpacityChange() override; 296 ~InFlightOpacityChange() override;
291 297
(...skipping 16 matching lines...) Expand all
308 void SetRevertValueFrom(const InFlightChange& change) override; 314 void SetRevertValueFrom(const InFlightChange& change) override;
309 void Revert() override; 315 void Revert() override;
310 316
311 private: 317 private:
312 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); 318 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange);
313 }; 319 };
314 320
315 } // namespace aura 321 } // namespace aura
316 322
317 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 323 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
OLDNEW
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/aura/mus/in_flight_change.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698