| 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 SERVICES_UI_PUBLIC_CPP_WINDOW_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_H_ |
| 6 #define SERVICES_UI_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 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 class WindowTreeClientPrivate; | 35 class WindowTreeClientPrivate; |
| 36 | 36 |
| 37 namespace { | 37 namespace { |
| 38 class OrderChangedNotifier; | 38 class OrderChangedNotifier; |
| 39 } | 39 } |
| 40 | 40 |
| 41 // Defined in window_property.h (which we do not include) | 41 // Defined in window_property.h (which we do not include) |
| 42 template <typename T> | 42 template <typename T> |
| 43 struct WindowProperty; | 43 struct WindowProperty; |
| 44 | 44 |
| 45 extern const char UI_EXPORT kWindowForAcceleratedWidget[]; |
| 46 |
| 45 // Windows are owned by the WindowTreeClient. See WindowTreeClientDelegate for | 47 // Windows are owned by the WindowTreeClient. See WindowTreeClientDelegate for |
| 46 // details on ownership. | 48 // details on ownership. |
| 47 // | 49 // |
| 48 // TODO(beng): Right now, you'll have to implement a WindowObserver to track | 50 // TODO(beng): Right now, you'll have to implement a WindowObserver to track |
| 49 // destruction and NULL any pointers you have. | 51 // destruction and NULL any pointers you have. |
| 50 // Investigate some kind of smart pointer or weak pointer for these. | 52 // Investigate some kind of smart pointer or weak pointer for these. |
| 51 class UI_EXPORT Window { | 53 class UI_EXPORT Window { |
| 52 public: | 54 public: |
| 53 using Children = std::vector<Window*>; | 55 using Children = std::vector<Window*>; |
| 54 using EmbedCallback = base::Callback<void(bool)>; | 56 using EmbedCallback = base::Callback<void(bool)>; |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 }; | 367 }; |
| 366 | 368 |
| 367 std::map<const void*, Value> prop_map_; | 369 std::map<const void*, Value> prop_map_; |
| 368 | 370 |
| 369 DISALLOW_COPY_AND_ASSIGN(Window); | 371 DISALLOW_COPY_AND_ASSIGN(Window); |
| 370 }; | 372 }; |
| 371 | 373 |
| 372 } // namespace ui | 374 } // namespace ui |
| 373 | 375 |
| 374 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_H_ | 376 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_H_ |
| OLD | NEW |