| 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 <string> | 10 #include <string> |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 // Gets a Window (either this one or a subwindow) containing |local_point|. | 281 // Gets a Window (either this one or a subwindow) containing |local_point|. |
| 282 // If |return_tightest| is true, returns the tightest-containing (i.e. | 282 // If |return_tightest| is true, returns the tightest-containing (i.e. |
| 283 // furthest down the hierarchy) Window containing the point; otherwise, | 283 // furthest down the hierarchy) Window containing the point; otherwise, |
| 284 // returns the loosest. If |for_event_handling| is true, then hit-test masks | 284 // returns the loosest. If |for_event_handling| is true, then hit-test masks |
| 285 // and StopsEventPropagation() are honored; otherwise, only bounds checks are | 285 // and StopsEventPropagation() are honored; otherwise, only bounds checks are |
| 286 // performed. | 286 // performed. |
| 287 Window* GetWindowForPoint(const gfx::Point& local_point, | 287 Window* GetWindowForPoint(const gfx::Point& local_point, |
| 288 bool return_tightest, | 288 bool return_tightest, |
| 289 bool for_event_handling); | 289 bool for_event_handling); |
| 290 | 290 |
| 291 // Called when this window's parent has changed. |
| 292 void OnParentChanged(); |
| 293 |
| 294 // Called when this window's stacking order among its siblings is changed. |
| 295 void OnStackingChanged(); |
| 296 |
| 291 // Overridden from ui::LayerDelegate: | 297 // Overridden from ui::LayerDelegate: |
| 292 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; | 298 virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; |
| 293 | 299 |
| 294 WindowType type_; | 300 WindowType type_; |
| 295 | 301 |
| 296 WindowDelegate* delegate_; | 302 WindowDelegate* delegate_; |
| 297 | 303 |
| 298 scoped_ptr<ui::Layer> layer_; | 304 scoped_ptr<ui::Layer> layer_; |
| 299 | 305 |
| 300 // The Window's parent. | 306 // The Window's parent. |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 // TODO(oshima): Consolidcate ViewProp and aura::window property | 339 // TODO(oshima): Consolidcate ViewProp and aura::window property |
| 334 // implementation. | 340 // implementation. |
| 335 std::map<const char*, void*> prop_map_; | 341 std::map<const char*, void*> prop_map_; |
| 336 | 342 |
| 337 DISALLOW_COPY_AND_ASSIGN(Window); | 343 DISALLOW_COPY_AND_ASSIGN(Window); |
| 338 }; | 344 }; |
| 339 | 345 |
| 340 } // namespace aura | 346 } // namespace aura |
| 341 | 347 |
| 342 #endif // UI_AURA_WINDOW_H_ | 348 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |