| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 const std::string& name() const { return name_; } | 71 const std::string& name() const { return name_; } |
| 72 void set_name(const std::string& name) { name_ = name; } | 72 void set_name(const std::string& name) { name_ = name; } |
| 73 | 73 |
| 74 ui::Layer* layer() { return layer_.get(); } | 74 ui::Layer* layer() { return layer_.get(); } |
| 75 const ui::Layer* layer() const { return layer_.get(); } | 75 const ui::Layer* layer() const { return layer_.get(); } |
| 76 | 76 |
| 77 WindowDelegate* delegate() { return delegate_; } | 77 WindowDelegate* delegate() { return delegate_; } |
| 78 | 78 |
| 79 const gfx::Rect& bounds() const; | 79 const gfx::Rect& bounds() const; |
| 80 const gfx::Rect& restore_bounds() const { return restore_bounds_; } |
| 80 | 81 |
| 81 Window* parent() { return parent_; } | 82 Window* parent() { return parent_; } |
| 82 const Window* parent() const { return parent_; } | 83 const Window* parent() const { return parent_; } |
| 83 | 84 |
| 84 // The Window does not own this object. | 85 // The Window does not own this object. |
| 85 void set_user_data(void* user_data) { user_data_ = user_data; } | 86 void set_user_data(void* user_data) { user_data_ = user_data; } |
| 86 void* user_data() const { return user_data_; } | 87 void* user_data() const { return user_data_; } |
| 87 | 88 |
| 88 // Changes the visibility of the window. | 89 // Changes the visibility of the window. |
| 89 void Show(); | 90 void Show(); |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 // TODO(oshima): Consolidcate ViewProp and aura::window property | 356 // TODO(oshima): Consolidcate ViewProp and aura::window property |
| 356 // implementation. | 357 // implementation. |
| 357 std::map<const char*, ui::ViewProp*> prop_map_; | 358 std::map<const char*, ui::ViewProp*> prop_map_; |
| 358 | 359 |
| 359 DISALLOW_COPY_AND_ASSIGN(Window); | 360 DISALLOW_COPY_AND_ASSIGN(Window); |
| 360 }; | 361 }; |
| 361 | 362 |
| 362 } // namespace aura | 363 } // namespace aura |
| 363 | 364 |
| 364 #endif // UI_AURA_WINDOW_H_ | 365 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |