Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: ui/aura/window.h

Issue 101013002: Make sure WindowObservers are removed from window before destruction (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shutdown order Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/client/default_activation_client.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 void* user_data_; 581 void* user_data_;
582 582
583 // Makes the window pass all events through to any windows behind it. 583 // Makes the window pass all events through to any windows behind it.
584 bool ignore_events_; 584 bool ignore_events_;
585 585
586 // See set_hit_test_outer_override(). 586 // See set_hit_test_outer_override().
587 gfx::Insets hit_test_bounds_override_outer_mouse_; 587 gfx::Insets hit_test_bounds_override_outer_mouse_;
588 gfx::Insets hit_test_bounds_override_outer_touch_; 588 gfx::Insets hit_test_bounds_override_outer_touch_;
589 gfx::Insets hit_test_bounds_override_inner_; 589 gfx::Insets hit_test_bounds_override_inner_;
590 590
591 ObserverList<WindowObserver> observers_; 591 ObserverList<WindowObserver, true> observers_;
592 592
593 // Value struct to keep the name and deallocator for this property. 593 // Value struct to keep the name and deallocator for this property.
594 // Key cannot be used for this purpose because it can be char* or 594 // Key cannot be used for this purpose because it can be char* or
595 // WindowProperty<>. 595 // WindowProperty<>.
596 struct Value { 596 struct Value {
597 const char* name; 597 const char* name;
598 int64 value; 598 int64 value;
599 PropertyDeallocator deallocator; 599 PropertyDeallocator deallocator;
600 }; 600 };
601 601
602 std::map<const void*, Value> prop_map_; 602 std::map<const void*, Value> prop_map_;
603 603
604 DISALLOW_COPY_AND_ASSIGN(Window); 604 DISALLOW_COPY_AND_ASSIGN(Window);
605 }; 605 };
606 606
607 } // namespace aura 607 } // namespace aura
608 608
609 #endif // UI_AURA_WINDOW_H_ 609 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/client/default_activation_client.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698