| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 UI_AURA_WINDOW_H_ | 5 #ifndef UI_AURA_WINDOW_H_ |
| 6 #define UI_AURA_WINDOW_H_ | 6 #define UI_AURA_WINDOW_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 static constexpr int kInitialId = -1; | 73 static constexpr int kInitialId = -1; |
| 74 | 74 |
| 75 // Used when stacking windows. | 75 // Used when stacking windows. |
| 76 enum StackDirection { | 76 enum StackDirection { |
| 77 STACK_ABOVE, | 77 STACK_ABOVE, |
| 78 STACK_BELOW | 78 STACK_BELOW |
| 79 }; | 79 }; |
| 80 | 80 |
| 81 typedef std::vector<Window*> Windows; | 81 typedef std::vector<Window*> Windows; |
| 82 | 82 |
| 83 explicit Window(WindowDelegate* delegate); | 83 explicit Window(WindowDelegate* delegate, |
| 84 Window(WindowDelegate* delegate, std::unique_ptr<WindowPort> port); | 84 ui::wm::WindowType type = ui::wm::WINDOW_TYPE_UNKNOWN); |
| 85 Window(WindowDelegate* delegate, |
| 86 std::unique_ptr<WindowPort> port, |
| 87 ui::wm::WindowType type = ui::wm::WINDOW_TYPE_UNKNOWN); |
| 85 ~Window() override; | 88 ~Window() override; |
| 86 | 89 |
| 87 // Initializes the window. This creates the window's layer. | 90 // Initializes the window. This creates the window's layer. |
| 88 void Init(ui::LayerType layer_type); | 91 void Init(ui::LayerType layer_type); |
| 89 | 92 |
| 90 void set_owned_by_parent(bool owned_by_parent) { | 93 void set_owned_by_parent(bool owned_by_parent) { |
| 91 owned_by_parent_ = owned_by_parent; | 94 owned_by_parent_ = owned_by_parent; |
| 92 } | 95 } |
| 93 bool owned_by_parent() const { return owned_by_parent_; } | 96 bool owned_by_parent() const { return owned_by_parent_; } |
| 94 | 97 |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 gfx::Insets hit_test_bounds_override_inner_; | 493 gfx::Insets hit_test_bounds_override_inner_; |
| 491 | 494 |
| 492 base::ObserverList<WindowObserver, true> observers_; | 495 base::ObserverList<WindowObserver, true> observers_; |
| 493 | 496 |
| 494 DISALLOW_COPY_AND_ASSIGN(Window); | 497 DISALLOW_COPY_AND_ASSIGN(Window); |
| 495 }; | 498 }; |
| 496 | 499 |
| 497 } // namespace aura | 500 } // namespace aura |
| 498 | 501 |
| 499 #endif // UI_AURA_WINDOW_H_ | 502 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |