| 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_WS_SERVER_WINDOW_H_ | 5 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_ |
| 6 #define COMPONENTS_MUS_WS_SERVER_WINDOW_H_ | 6 #define SERVICES_UI_WS_SERVER_WINDOW_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "components/mus/public/interfaces/surface.mojom.h" | |
| 18 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
| 19 #include "components/mus/ws/ids.h" | |
| 20 #include "components/mus/ws/server_window_surface.h" | |
| 21 #include "mojo/public/cpp/bindings/binding.h" | 17 #include "mojo/public/cpp/bindings/binding.h" |
| 18 #include "services/ui/public/interfaces/surface.mojom.h" |
| 19 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 20 #include "services/ui/ws/ids.h" |
| 21 #include "services/ui/ws/server_window_surface.h" |
| 22 #include "ui/gfx/geometry/insets.h" | 22 #include "ui/gfx/geometry/insets.h" |
| 23 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
| 24 #include "ui/gfx/geometry/vector2d.h" | 24 #include "ui/gfx/geometry/vector2d.h" |
| 25 #include "ui/gfx/transform.h" | 25 #include "ui/gfx/transform.h" |
| 26 #include "ui/platform_window/text_input_state.h" | 26 #include "ui/platform_window/text_input_state.h" |
| 27 | 27 |
| 28 namespace mus { | 28 namespace mus { |
| 29 namespace ws { | 29 namespace ws { |
| 30 | 30 |
| 31 class ServerWindowDelegate; | 31 class ServerWindowDelegate; |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 std::unique_ptr<gfx::Rect> hit_test_mask_; | 239 std::unique_ptr<gfx::Rect> hit_test_mask_; |
| 240 | 240 |
| 241 base::ObserverList<ServerWindowObserver> observers_; | 241 base::ObserverList<ServerWindowObserver> observers_; |
| 242 | 242 |
| 243 DISALLOW_COPY_AND_ASSIGN(ServerWindow); | 243 DISALLOW_COPY_AND_ASSIGN(ServerWindow); |
| 244 }; | 244 }; |
| 245 | 245 |
| 246 } // namespace ws | 246 } // namespace ws |
| 247 } // namespace mus | 247 } // namespace mus |
| 248 | 248 |
| 249 #endif // COMPONENTS_MUS_WS_SERVER_WINDOW_H_ | 249 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ |
| OLD | NEW |