| 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 COMPONENTS_MUS_PUBLIC_CPP_LIB_IN_FLIGHT_CHANGE_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_LIB_IN_FLIGHT_CHANGE_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_LIB_IN_FLIGHT_CHANGE_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_LIB_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 "components/mus/public/cpp/window_observer.h" | |
| 17 #include "mojo/public/cpp/bindings/array.h" | 16 #include "mojo/public/cpp/bindings/array.h" |
| 17 #include "services/ui/public/cpp/window_observer.h" |
| 18 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 19 | 19 |
| 20 namespace mus { | 20 namespace mus { |
| 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 class Window; | 26 class Window; |
| 27 class WindowTreeClient; | 27 class WindowTreeClient; |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 // InFlightChange: | 288 // InFlightChange: |
| 289 void SetRevertValueFrom(const InFlightChange& change) override; | 289 void SetRevertValueFrom(const InFlightChange& change) override; |
| 290 void Revert() override; | 290 void Revert() override; |
| 291 | 291 |
| 292 private: | 292 private: |
| 293 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); | 293 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange); |
| 294 }; | 294 }; |
| 295 | 295 |
| 296 } // namespace mus | 296 } // namespace mus |
| 297 | 297 |
| 298 #endif // COMPONENTS_MUS_PUBLIC_CPP_LIB_IN_FLIGHT_CHANGE_H_ | 298 #endif // SERVICES_UI_PUBLIC_CPP_LIB_IN_FLIGHT_CHANGE_H_ |
| OLD | NEW |