| 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 // furthest down the hierarchy) Window containing the point; otherwise, | 300 // furthest down the hierarchy) Window containing the point; otherwise, |
| 301 // returns the loosest. If |for_event_handling| is true, then hit-test masks | 301 // returns the loosest. If |for_event_handling| is true, then hit-test masks |
| 302 // and StopsEventPropagation() are honored; otherwise, only bounds checks are | 302 // and StopsEventPropagation() are honored; otherwise, only bounds checks are |
| 303 // performed. | 303 // performed. |
| 304 Window* GetWindowForPoint(const gfx::Point& local_point, | 304 Window* GetWindowForPoint(const gfx::Point& local_point, |
| 305 bool return_tightest, | 305 bool return_tightest, |
| 306 bool for_event_handling); | 306 bool for_event_handling); |
| 307 | 307 |
| 308 // Overridden from ui::LayerDelegate: | 308 // Overridden from ui::LayerDelegate: |
| 309 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; | 309 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; |
| 310 virtual void OnLayerAnimationEnded( | |
| 311 const ui::LayerAnimationSequence* animation) OVERRIDE; | |
| 312 | 310 |
| 313 int type_; | 311 int type_; |
| 314 | 312 |
| 315 WindowDelegate* delegate_; | 313 WindowDelegate* delegate_; |
| 316 | 314 |
| 317 ui::WindowShowState show_state_; | 315 ui::WindowShowState show_state_; |
| 318 | 316 |
| 319 // The original bounds of a maximized/fullscreen window. | 317 // The original bounds of a maximized/fullscreen window. |
| 320 gfx::Rect restore_bounds_; | 318 gfx::Rect restore_bounds_; |
| 321 | 319 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 // TODO(oshima): Consolidcate ViewProp and aura::window property | 353 // TODO(oshima): Consolidcate ViewProp and aura::window property |
| 356 // implementation. | 354 // implementation. |
| 357 std::map<const char*, ui::ViewProp*> prop_map_; | 355 std::map<const char*, ui::ViewProp*> prop_map_; |
| 358 | 356 |
| 359 DISALLOW_COPY_AND_ASSIGN(Window); | 357 DISALLOW_COPY_AND_ASSIGN(Window); |
| 360 }; | 358 }; |
| 361 | 359 |
| 362 } // namespace aura | 360 } // namespace aura |
| 363 | 361 |
| 364 #endif // UI_AURA_WINDOW_H_ | 362 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |