| 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 "cc/surfaces/local_frame_id.h" |
| 16 #include "ui/aura/window_observer.h" | 17 #include "ui/aura/window_observer.h" |
| 17 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 18 | 19 |
| 19 namespace ui { | 20 namespace ui { |
| 20 | 21 |
| 21 namespace mojom { | 22 namespace mojom { |
| 22 enum class Cursor : int32_t; | 23 enum class Cursor : int32_t; |
| 23 } | 24 } |
| 24 | 25 |
| 25 } // namespace ui | 26 } // namespace ui |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 | 134 |
| 134 private: | 135 private: |
| 135 WindowMus* window_; | 136 WindowMus* window_; |
| 136 const ChangeType change_type_; | 137 const ChangeType change_type_; |
| 137 }; | 138 }; |
| 138 | 139 |
| 139 class InFlightBoundsChange : public InFlightChange { | 140 class InFlightBoundsChange : public InFlightChange { |
| 140 public: | 141 public: |
| 141 InFlightBoundsChange(WindowTreeClient* window_tree_client, | 142 InFlightBoundsChange(WindowTreeClient* window_tree_client, |
| 142 WindowMus* window, | 143 WindowMus* window, |
| 143 const gfx::Rect& revert_bounds); | 144 const gfx::Rect& revert_bounds, |
| 145 const cc::LocalFrameId& local_frame_id); |
| 144 | 146 |
| 145 // InFlightChange: | 147 // InFlightChange: |
| 146 void SetRevertValueFrom(const InFlightChange& change) override; | 148 void SetRevertValueFrom(const InFlightChange& change) override; |
| 147 void Revert() override; | 149 void Revert() override; |
| 148 | 150 |
| 149 private: | 151 private: |
| 150 WindowTreeClient* window_tree_client_; | 152 WindowTreeClient* window_tree_client_; |
| 151 gfx::Rect revert_bounds_; | 153 gfx::Rect revert_bounds_; |
| 154 cc::LocalFrameId revert_local_frame_id_; |
| 152 | 155 |
| 153 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange); | 156 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange); |
| 154 }; | 157 }; |
| 155 | 158 |
| 156 class InFlightDragChange : public InFlightChange { | 159 class InFlightDragChange : public InFlightChange { |
| 157 public: | 160 public: |
| 158 InFlightDragChange(WindowMus* window, ChangeType type); | 161 InFlightDragChange(WindowMus* window, ChangeType type); |
| 159 | 162 |
| 160 // InFlightChange: | 163 // InFlightChange: |
| 161 void SetRevertValueFrom(const InFlightChange& change) override; | 164 void SetRevertValueFrom(const InFlightChange& change) override; |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 void SetRevertValueFrom(const InFlightChange& change) override; | 325 void SetRevertValueFrom(const InFlightChange& change) override; |
| 323 void Revert() override; | 326 void Revert() override; |
| 324 | 327 |
| 325 private: | 328 private: |
| 326 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); | 329 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); |
| 327 }; | 330 }; |
| 328 | 331 |
| 329 } // namespace aura | 332 } // namespace aura |
| 330 | 333 |
| 331 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ | 334 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ |
| OLD | NEW |