| OLD | NEW |
| 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> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 16 #include "mojo/public/cpp/bindings/array.h" | 16 #include "mojo/public/cpp/bindings/array.h" |
| 17 #include "ui/aura/window_observer.h" | 17 #include "ui/aura/window_observer.h" |
| 18 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 19 | 19 |
| 20 namespace ui { | 20 namespace ui { |
| 21 | 21 |
| 22 namespace mojom { | 22 namespace mojom { |
| 23 enum class Cursor : int32_t; | 23 enum class Cursor : int32_t; |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace ui | 26 } // namespace ui |
| 27 | 27 |
| 28 namespace aura { | 28 namespace aura { |
| 29 | 29 |
| 30 class CaptureSynchronizer; |
| 30 class WindowMus; | 31 class WindowMus; |
| 31 class WindowTreeClient; | 32 class WindowTreeClient; |
| 32 | 33 |
| 33 enum class ChangeType { | 34 enum class ChangeType { |
| 34 ADD_CHILD, | 35 ADD_CHILD, |
| 35 ADD_TRANSIENT_WINDOW, | 36 ADD_TRANSIENT_WINDOW, |
| 36 BOUNDS, | 37 BOUNDS, |
| 37 CAPTURE, | 38 CAPTURE, |
| 38 DELETE_WINDOW, | 39 DELETE_WINDOW, |
| 39 DRAG_LOOP, | 40 DRAG_LOOP, |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 void OnWindowDestroyed(Window* window) override; | 209 void OnWindowDestroyed(Window* window) override; |
| 209 | 210 |
| 210 WindowTreeClient* client_; | 211 WindowTreeClient* client_; |
| 211 WindowMus* revert_window_; | 212 WindowMus* revert_window_; |
| 212 | 213 |
| 213 DISALLOW_COPY_AND_ASSIGN(InFlightWindowTreeClientChange); | 214 DISALLOW_COPY_AND_ASSIGN(InFlightWindowTreeClientChange); |
| 214 }; | 215 }; |
| 215 | 216 |
| 216 class InFlightCaptureChange : public InFlightWindowTreeClientChange { | 217 class InFlightCaptureChange : public InFlightWindowTreeClientChange { |
| 217 public: | 218 public: |
| 218 InFlightCaptureChange(WindowTreeClient* client, WindowMus* revert_value); | 219 InFlightCaptureChange(WindowTreeClient* client, |
| 220 CaptureSynchronizer* capture_synchronizer, |
| 221 WindowMus* revert_value); |
| 219 ~InFlightCaptureChange() override; | 222 ~InFlightCaptureChange() override; |
| 220 | 223 |
| 221 // InFlightChange: | 224 // InFlightChange: |
| 222 void Revert() override; | 225 void Revert() override; |
| 223 | 226 |
| 224 private: | 227 private: |
| 228 CaptureSynchronizer* capture_synchronizer_; |
| 225 DISALLOW_COPY_AND_ASSIGN(InFlightCaptureChange); | 229 DISALLOW_COPY_AND_ASSIGN(InFlightCaptureChange); |
| 226 }; | 230 }; |
| 227 | 231 |
| 228 class InFlightFocusChange : public InFlightWindowTreeClientChange { | 232 class InFlightFocusChange : public InFlightWindowTreeClientChange { |
| 229 public: | 233 public: |
| 230 InFlightFocusChange(WindowTreeClient* client, WindowMus* revert_value); | 234 InFlightFocusChange(WindowTreeClient* client, WindowMus* revert_value); |
| 231 ~InFlightFocusChange() override; | 235 ~InFlightFocusChange() override; |
| 232 | 236 |
| 233 // InFlightChange: | 237 // InFlightChange: |
| 234 void Revert() override; | 238 void Revert() override; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 void SetRevertValueFrom(const InFlightChange& change) override; | 318 void SetRevertValueFrom(const InFlightChange& change) override; |
| 315 void Revert() override; | 319 void Revert() override; |
| 316 | 320 |
| 317 private: | 321 private: |
| 318 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); | 322 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); |
| 319 }; | 323 }; |
| 320 | 324 |
| 321 } // namespace aura | 325 } // namespace aura |
| 322 | 326 |
| 323 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ | 327 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ |
| OLD | NEW |