| 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 COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ | 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace mus { | 27 namespace mus { |
| 28 | 28 |
| 29 class InputEventHandler; | 29 class InputEventHandler; |
| 30 class ServiceProviderImpl; | 30 class ServiceProviderImpl; |
| 31 class WindowObserver; | 31 class WindowObserver; |
| 32 class WindowSurface; | 32 class WindowSurface; |
| 33 class WindowSurfaceBinding; | 33 class WindowSurfaceBinding; |
| 34 class WindowTreeClientImpl; | 34 class WindowTreeClientImpl; |
| 35 class WindowTreeClientImplPrivate; |
| 35 class WindowTreeConnection; | 36 class WindowTreeConnection; |
| 36 | 37 |
| 37 namespace { | 38 namespace { |
| 38 class OrderChangedNotifier; | 39 class OrderChangedNotifier; |
| 39 } | 40 } |
| 40 | 41 |
| 41 // Defined in window_property.h (which we do not include) | 42 // Defined in window_property.h (which we do not include) |
| 42 template <typename T> | 43 template <typename T> |
| 43 struct WindowProperty; | 44 struct WindowProperty; |
| 44 | 45 |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 std::string GetName() const; | 223 std::string GetName() const; |
| 223 | 224 |
| 224 protected: | 225 protected: |
| 225 // This class is subclassed only by test classes that provide a public ctor. | 226 // This class is subclassed only by test classes that provide a public ctor. |
| 226 Window(); | 227 Window(); |
| 227 ~Window(); | 228 ~Window(); |
| 228 | 229 |
| 229 private: | 230 private: |
| 230 friend class WindowPrivate; | 231 friend class WindowPrivate; |
| 231 friend class WindowTreeClientImpl; | 232 friend class WindowTreeClientImpl; |
| 233 friend class WindowTreeClientImplPrivate; |
| 232 | 234 |
| 233 Window(WindowTreeConnection* connection, Id id); | 235 Window(WindowTreeConnection* connection, Id id); |
| 234 | 236 |
| 235 // Used to identify this Window on the server. Clients can not change this | 237 // Used to identify this Window on the server. Clients can not change this |
| 236 // value. | 238 // value. |
| 237 Id server_id() const { return server_id_; } | 239 Id server_id() const { return server_id_; } |
| 238 | 240 |
| 239 WindowTreeClientImpl* tree_client(); | 241 WindowTreeClientImpl* tree_client(); |
| 240 | 242 |
| 241 // Applies a shared property change locally and forwards to the server. If | 243 // Applies a shared property change locally and forwards to the server. If |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 }; | 347 }; |
| 346 | 348 |
| 347 std::map<const void*, Value> prop_map_; | 349 std::map<const void*, Value> prop_map_; |
| 348 | 350 |
| 349 DISALLOW_COPY_AND_ASSIGN(Window); | 351 DISALLOW_COPY_AND_ASSIGN(Window); |
| 350 }; | 352 }; |
| 351 | 353 |
| 352 } // namespace mus | 354 } // namespace mus |
| 353 | 355 |
| 354 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ | 356 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_H_ |
| OLD | NEW |