| 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> |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 // Notifies this window and its parent hierarchy. | 445 // Notifies this window and its parent hierarchy. |
| 446 void NotifyWindowVisibilityChangedUp(aura::Window* target, bool visible); | 446 void NotifyWindowVisibilityChangedUp(aura::Window* target, bool visible); |
| 447 | 447 |
| 448 // Invoked when the bounds of the window changes. This may be invoked directly | 448 // Invoked when the bounds of the window changes. This may be invoked directly |
| 449 // by us, or from the closure returned by PrepareForLayerBoundsChange() after | 449 // by us, or from the closure returned by PrepareForLayerBoundsChange() after |
| 450 // the bounds of the layer has changed. |old_bounds| is the previous bounds. | 450 // the bounds of the layer has changed. |old_bounds| is the previous bounds. |
| 451 void OnWindowBoundsChanged(const gfx::Rect& old_bounds); | 451 void OnWindowBoundsChanged(const gfx::Rect& old_bounds); |
| 452 | 452 |
| 453 // Overridden from ui::LayerDelegate: | 453 // Overridden from ui::LayerDelegate: |
| 454 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; | 454 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; |
| 455 virtual void OnDelegatedFrameDamage( |
| 456 const gfx::Rect& damage_rect_in_dip) OVERRIDE; |
| 455 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; | 457 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; |
| 456 | 458 |
| 457 // Overridden from ui::EventTarget: | 459 // Overridden from ui::EventTarget: |
| 458 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; | 460 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; |
| 459 virtual EventTarget* GetParentTarget() OVERRIDE; | 461 virtual EventTarget* GetParentTarget() OVERRIDE; |
| 460 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; | 462 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; |
| 461 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; | 463 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; |
| 462 virtual void ConvertEventToTarget(ui::EventTarget* target, | 464 virtual void ConvertEventToTarget(ui::EventTarget* target, |
| 463 ui::LocatedEvent* event) OVERRIDE; | 465 ui::LocatedEvent* event) OVERRIDE; |
| 464 | 466 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 }; | 537 }; |
| 536 | 538 |
| 537 std::map<const void*, Value> prop_map_; | 539 std::map<const void*, Value> prop_map_; |
| 538 | 540 |
| 539 DISALLOW_COPY_AND_ASSIGN(Window); | 541 DISALLOW_COPY_AND_ASSIGN(Window); |
| 540 }; | 542 }; |
| 541 | 543 |
| 542 } // namespace aura | 544 } // namespace aura |
| 543 | 545 |
| 544 #endif // UI_AURA_WINDOW_H_ | 546 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |