| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 // A type is used to identify a class of Windows and customize behavior such | 97 // A type is used to identify a class of Windows and customize behavior such |
| 98 // as event handling and parenting. This field should only be consumed by the | 98 // as event handling and parenting. This field should only be consumed by the |
| 99 // shell -- Aura itself shouldn't contain type-specific logic. | 99 // shell -- Aura itself shouldn't contain type-specific logic. |
| 100 ui::wm::WindowType type() const { return type_; } | 100 ui::wm::WindowType type() const { return type_; } |
| 101 void SetType(ui::wm::WindowType type); | 101 void SetType(ui::wm::WindowType type); |
| 102 | 102 |
| 103 int id() const { return id_; } | 103 int id() const { return id_; } |
| 104 void set_id(int id) { id_ = id; } | 104 void set_id(int id) { id_ = id; } |
| 105 | 105 |
| 106 const std::string& name() const { return name_; } | 106 const std::string& GetName() const; |
| 107 void SetName(const std::string& name); | 107 void SetName(const std::string& name); |
| 108 | 108 |
| 109 const base::string16 title() const { return title_; } | 109 const base::string16& GetTitle() const; |
| 110 void SetTitle(const base::string16& title); | 110 void SetTitle(const base::string16& title); |
| 111 | 111 |
| 112 bool transparent() const { return transparent_; } | 112 bool transparent() const { return transparent_; } |
| 113 void SetTransparent(bool transparent); | 113 void SetTransparent(bool transparent); |
| 114 | 114 |
| 115 // See description in Layer::SetFillsBoundsCompletely. | 115 // See description in Layer::SetFillsBoundsCompletely. |
| 116 void SetFillsBoundsCompletely(bool fills_bounds); | 116 void SetFillsBoundsCompletely(bool fills_bounds); |
| 117 | 117 |
| 118 WindowDelegate* delegate() { return delegate_; } | 118 WindowDelegate* delegate() { return delegate_; } |
| 119 const WindowDelegate* delegate() const { return delegate_; } | 119 const WindowDelegate* delegate() const { return delegate_; } |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 | 493 |
| 494 // Child windows. Topmost is last. | 494 // Child windows. Topmost is last. |
| 495 Windows children_; | 495 Windows children_; |
| 496 | 496 |
| 497 // The visibility state of the window as set by Show()/Hide(). This may differ | 497 // The visibility state of the window as set by Show()/Hide(). This may differ |
| 498 // from the visibility of the underlying layer, which may remain visible after | 498 // from the visibility of the underlying layer, which may remain visible after |
| 499 // the window is hidden (e.g. to animate its disappearance). | 499 // the window is hidden (e.g. to animate its disappearance). |
| 500 bool visible_; | 500 bool visible_; |
| 501 | 501 |
| 502 int id_; | 502 int id_; |
| 503 std::string name_; | |
| 504 | |
| 505 base::string16 title_; | |
| 506 | 503 |
| 507 // Whether layer is initialized as non-opaque. | 504 // Whether layer is initialized as non-opaque. |
| 508 bool transparent_; | 505 bool transparent_; |
| 509 | 506 |
| 510 std::unique_ptr<LayoutManager> layout_manager_; | 507 std::unique_ptr<LayoutManager> layout_manager_; |
| 511 std::unique_ptr<ui::EventTargeter> targeter_; | 508 std::unique_ptr<ui::EventTargeter> targeter_; |
| 512 | 509 |
| 513 void* user_data_; | 510 void* user_data_; |
| 514 | 511 |
| 515 // Makes the window pass all events through to any windows behind it. | 512 // Makes the window pass all events through to any windows behind it. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 530 }; | 527 }; |
| 531 | 528 |
| 532 std::map<const void*, Value> prop_map_; | 529 std::map<const void*, Value> prop_map_; |
| 533 | 530 |
| 534 DISALLOW_COPY_AND_ASSIGN(Window); | 531 DISALLOW_COPY_AND_ASSIGN(Window); |
| 535 }; | 532 }; |
| 536 | 533 |
| 537 } // namespace aura | 534 } // namespace aura |
| 538 | 535 |
| 539 #endif // UI_AURA_WINDOW_H_ | 536 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |