| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_WINDOW_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 14 #include "components/mus/common/types.h" | |
| 15 #include "components/mus/public/interfaces/mus_constants.mojom.h" | |
| 16 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
| 17 #include "mojo/public/cpp/bindings/array.h" | 14 #include "mojo/public/cpp/bindings/array.h" |
| 18 #include "services/shell/public/interfaces/interface_provider.mojom.h" | 15 #include "services/shell/public/interfaces/interface_provider.mojom.h" |
| 16 #include "services/ui/common/types.h" |
| 17 #include "services/ui/public/interfaces/mus_constants.mojom.h" |
| 18 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 19 #include "ui/gfx/geometry/insets.h" | 19 #include "ui/gfx/geometry/insets.h" |
| 20 #include "ui/gfx/geometry/rect.h" | 20 #include "ui/gfx/geometry/rect.h" |
| 21 | 21 |
| 22 namespace gfx { | 22 namespace gfx { |
| 23 class Size; | 23 class Size; |
| 24 } | 24 } |
| 25 | 25 |
| 26 namespace mus { | 26 namespace mus { |
| 27 | 27 |
| 28 class InputEventHandler; | 28 class InputEventHandler; |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 PropertyDeallocator deallocator; | 346 PropertyDeallocator deallocator; |
| 347 }; | 347 }; |
| 348 | 348 |
| 349 std::map<const void*, Value> prop_map_; | 349 std::map<const void*, Value> prop_map_; |
| 350 | 350 |
| 351 DISALLOW_COPY_AND_ASSIGN(Window); | 351 DISALLOW_COPY_AND_ASSIGN(Window); |
| 352 }; | 352 }; |
| 353 | 353 |
| 354 } // namespace mus | 354 } // namespace mus |
| 355 | 355 |
| 356 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ | 356 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_H_ |
| OLD | NEW |