| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 | 74 |
| 75 const string16 title() const { return title_; } | 75 const string16 title() const { return title_; } |
| 76 void set_title(const string16& title) { title_ = title; } | 76 void set_title(const string16& title) { title_ = title; } |
| 77 | 77 |
| 78 ui::Layer* layer() { return layer_.get(); } | 78 ui::Layer* layer() { return layer_.get(); } |
| 79 const ui::Layer* layer() const { return layer_.get(); } | 79 const ui::Layer* layer() const { return layer_.get(); } |
| 80 | 80 |
| 81 WindowDelegate* delegate() { return delegate_; } | 81 WindowDelegate* delegate() { return delegate_; } |
| 82 | 82 |
| 83 const gfx::Rect& bounds() const; | 83 const gfx::Rect& bounds() const; |
| 84 const gfx::Rect& restore_bounds() const { return restore_bounds_; } | |
| 85 | 84 |
| 86 Window* parent() { return parent_; } | 85 Window* parent() { return parent_; } |
| 87 const Window* parent() const { return parent_; } | 86 const Window* parent() const { return parent_; } |
| 88 | 87 |
| 89 // The Window does not own this object. | 88 // The Window does not own this object. |
| 90 void set_user_data(void* user_data) { user_data_ = user_data; } | 89 void set_user_data(void* user_data) { user_data_ = user_data; } |
| 91 void* user_data() const { return user_data_; } | 90 void* user_data() const { return user_data_; } |
| 92 | 91 |
| 93 // Changes the visibility of the window. | 92 // Changes the visibility of the window. |
| 94 void Show(); | 93 void Show(); |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 bool return_tightest, | 299 bool return_tightest, |
| 301 bool for_event_handling); | 300 bool for_event_handling); |
| 302 | 301 |
| 303 // Overridden from ui::LayerDelegate: | 302 // Overridden from ui::LayerDelegate: |
| 304 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; | 303 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; |
| 305 | 304 |
| 306 WindowType type_; | 305 WindowType type_; |
| 307 | 306 |
| 308 WindowDelegate* delegate_; | 307 WindowDelegate* delegate_; |
| 309 | 308 |
| 310 // The original bounds of a maximized/fullscreen window. | |
| 311 gfx::Rect restore_bounds_; | |
| 312 | |
| 313 // The minimum size of the window a user can resize to. | 309 // The minimum size of the window a user can resize to. |
| 314 gfx::Size minimum_size_; | 310 gfx::Size minimum_size_; |
| 315 | 311 |
| 316 scoped_ptr<ui::Layer> layer_; | 312 scoped_ptr<ui::Layer> layer_; |
| 317 | 313 |
| 318 // The Window's parent. | 314 // The Window's parent. |
| 319 Window* parent_; | 315 Window* parent_; |
| 320 | 316 |
| 321 // Child windows. Topmost is last. | 317 // Child windows. Topmost is last. |
| 322 Windows children_; | 318 Windows children_; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 348 // TODO(oshima): Consolidcate ViewProp and aura::window property | 344 // TODO(oshima): Consolidcate ViewProp and aura::window property |
| 349 // implementation. | 345 // implementation. |
| 350 std::map<const char*, void*> prop_map_; | 346 std::map<const char*, void*> prop_map_; |
| 351 | 347 |
| 352 DISALLOW_COPY_AND_ASSIGN(Window); | 348 DISALLOW_COPY_AND_ASSIGN(Window); |
| 353 }; | 349 }; |
| 354 | 350 |
| 355 } // namespace aura | 351 } // namespace aura |
| 356 | 352 |
| 357 #endif // UI_AURA_WINDOW_H_ | 353 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |