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

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

Issue 10808063: Revert "chromeos: Add a bool flag to catch crash cause of http://crbug.com/134507." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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 | « no previous file | 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 // Key cannot be used for this purpose because it can be char* or 472 // Key cannot be used for this purpose because it can be char* or
473 // WindowProperty<>. 473 // WindowProperty<>.
474 struct Value { 474 struct Value {
475 const char* name; 475 const char* name;
476 intptr_t value; 476 intptr_t value;
477 PropertyDeallocator deallocator; 477 PropertyDeallocator deallocator;
478 }; 478 };
479 479
480 std::map<const void*, Value> prop_map_; 480 std::map<const void*, Value> prop_map_;
481 481
482 // A boolean flag to debug crash in http://crbug.com/134507. It is set when
483 // SetVisible is called and reset when SetVisible finishes. In Window dtor,
484 // the flag is CHECKed to catch the case that Window is destroyed during
485 // SetVisbile(false).
486 // TODO(xiyuan): Remove this when http://crbug.com/134507 is resolved.
487 bool in_set_visible_call_;
488
489 DISALLOW_COPY_AND_ASSIGN(Window); 482 DISALLOW_COPY_AND_ASSIGN(Window);
490 }; 483 };
491 484
492 } // namespace aura 485 } // namespace aura
493 486
494 #endif // UI_AURA_WINDOW_H_ 487 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698