| 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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 scoped_ptr<ui::EventTargeter> targeter_; | 525 scoped_ptr<ui::EventTargeter> targeter_; |
| 526 | 526 |
| 527 void* user_data_; | 527 void* user_data_; |
| 528 | 528 |
| 529 // Makes the window pass all events through to any windows behind it. | 529 // Makes the window pass all events through to any windows behind it. |
| 530 bool ignore_events_; | 530 bool ignore_events_; |
| 531 | 531 |
| 532 // See set_hit_test_bounds_override_inner(). | 532 // See set_hit_test_bounds_override_inner(). |
| 533 gfx::Insets hit_test_bounds_override_inner_; | 533 gfx::Insets hit_test_bounds_override_inner_; |
| 534 | 534 |
| 535 ObserverList<WindowObserver, true> observers_; | 535 base::ObserverList<WindowObserver, true> observers_; |
| 536 | 536 |
| 537 // Value struct to keep the name and deallocator for this property. | 537 // Value struct to keep the name and deallocator for this property. |
| 538 // Key cannot be used for this purpose because it can be char* or | 538 // Key cannot be used for this purpose because it can be char* or |
| 539 // WindowProperty<>. | 539 // WindowProperty<>. |
| 540 struct Value { | 540 struct Value { |
| 541 const char* name; | 541 const char* name; |
| 542 int64 value; | 542 int64 value; |
| 543 PropertyDeallocator deallocator; | 543 PropertyDeallocator deallocator; |
| 544 }; | 544 }; |
| 545 | 545 |
| 546 std::map<const void*, Value> prop_map_; | 546 std::map<const void*, Value> prop_map_; |
| 547 | 547 |
| 548 DISALLOW_COPY_AND_ASSIGN(Window); | 548 DISALLOW_COPY_AND_ASSIGN(Window); |
| 549 }; | 549 }; |
| 550 | 550 |
| 551 } // namespace aura | 551 } // namespace aura |
| 552 | 552 |
| 553 #endif // UI_AURA_WINDOW_H_ | 553 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |