| 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 <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 16 #include "base/strings/string16.h" | 16 #include "base/strings/string16.h" |
| 17 #include "ui/aura/aura_export.h" | 17 #include "ui/aura/aura_export.h" |
| 18 #include "ui/aura/window_layer_type.h" | |
| 19 #include "ui/aura/window_observer.h" | 18 #include "ui/aura/window_observer.h" |
| 20 #include "ui/compositor/layer_animator.h" | 19 #include "ui/compositor/layer_animator.h" |
| 21 #include "ui/compositor/layer_delegate.h" | 20 #include "ui/compositor/layer_delegate.h" |
| 22 #include "ui/compositor/layer_owner.h" | 21 #include "ui/compositor/layer_owner.h" |
| 23 #include "ui/events/event_constants.h" | 22 #include "ui/events/event_constants.h" |
| 24 #include "ui/events/event_target.h" | 23 #include "ui/events/event_target.h" |
| 25 #include "ui/events/event_targeter.h" | 24 #include "ui/events/event_targeter.h" |
| 26 #include "ui/events/gestures/gesture_types.h" | 25 #include "ui/events/gestures/gesture_types.h" |
| 27 #include "ui/gfx/geometry/insets.h" | 26 #include "ui/gfx/geometry/insets.h" |
| 28 #include "ui/gfx/geometry/rect.h" | 27 #include "ui/gfx/geometry/rect.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 STACK_ABOVE, | 73 STACK_ABOVE, |
| 75 STACK_BELOW | 74 STACK_BELOW |
| 76 }; | 75 }; |
| 77 | 76 |
| 78 typedef std::vector<Window*> Windows; | 77 typedef std::vector<Window*> Windows; |
| 79 | 78 |
| 80 explicit Window(WindowDelegate* delegate); | 79 explicit Window(WindowDelegate* delegate); |
| 81 ~Window() override; | 80 ~Window() override; |
| 82 | 81 |
| 83 // Initializes the window. This creates the window's layer. | 82 // Initializes the window. This creates the window's layer. |
| 84 void Init(WindowLayerType layer_type); | 83 void Init(ui::LayerType layer_type); |
| 85 | 84 |
| 86 void set_owned_by_parent(bool owned_by_parent) { | 85 void set_owned_by_parent(bool owned_by_parent) { |
| 87 owned_by_parent_ = owned_by_parent; | 86 owned_by_parent_ = owned_by_parent; |
| 88 } | 87 } |
| 89 bool owned_by_parent() const { return owned_by_parent_; } | 88 bool owned_by_parent() const { return owned_by_parent_; } |
| 90 | 89 |
| 91 // A type is used to identify a class of Windows and customize behavior such | 90 // A type is used to identify a class of Windows and customize behavior such |
| 92 // as event handling and parenting. This field should only be consumed by the | 91 // as event handling and parenting. This field should only be consumed by the |
| 93 // shell -- Aura itself shouldn't contain type-specific logic. | 92 // shell -- Aura itself shouldn't contain type-specific logic. |
| 94 ui::wm::WindowType type() const { return type_; } | 93 ui::wm::WindowType type() const { return type_; } |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 }; | 545 }; |
| 547 | 546 |
| 548 std::map<const void*, Value> prop_map_; | 547 std::map<const void*, Value> prop_map_; |
| 549 | 548 |
| 550 DISALLOW_COPY_AND_ASSIGN(Window); | 549 DISALLOW_COPY_AND_ASSIGN(Window); |
| 551 }; | 550 }; |
| 552 | 551 |
| 553 } // namespace aura | 552 } // namespace aura |
| 554 | 553 |
| 555 #endif // UI_AURA_WINDOW_H_ | 554 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |