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

Side by Side Diff: ash/wm/system_modal_container_layout_manager.h

Issue 9348113: Fix two crash and potential leak&crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert unnecessary file, updated comment Created 8 years, 10 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
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 ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
6 #define ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ 6 #define ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; 47 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE;
48 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 48 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
49 bool visibile) OVERRIDE; 49 bool visibile) OVERRIDE;
50 virtual void SetChildBounds(aura::Window* child, 50 virtual void SetChildBounds(aura::Window* child,
51 const gfx::Rect& requested_bounds) OVERRIDE; 51 const gfx::Rect& requested_bounds) OVERRIDE;
52 52
53 // Overridden from aura::WindowObserver: 53 // Overridden from aura::WindowObserver:
54 virtual void OnWindowPropertyChanged(aura::Window* window, 54 virtual void OnWindowPropertyChanged(aura::Window* window,
55 const void* key, 55 const void* key,
56 intptr_t old) OVERRIDE; 56 intptr_t old) OVERRIDE;
57 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
57 58
58 // Overridden from ui::ImplicitAnimationObserver: 59 // Overridden from ui::ImplicitAnimationObserver:
59 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 60 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
60 61
61 // Overridden from SystemModalContainerEventFilterDelegate: 62 // Overridden from SystemModalContainerEventFilterDelegate:
62 virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; 63 virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE;
63 64
64 private: 65 private:
65 void AddModalWindow(aura::Window* window); 66 void AddModalWindow(aura::Window* window);
66 void RemoveModalWindow(aura::Window* window); 67 void RemoveModalWindow(aura::Window* window);
(...skipping 21 matching lines...) Expand all
88 // added, and removed when the last is closed. 89 // added, and removed when the last is closed.
89 scoped_ptr<aura::EventFilter> modality_filter_; 90 scoped_ptr<aura::EventFilter> modality_filter_;
90 91
91 DISALLOW_COPY_AND_ASSIGN(SystemModalContainerLayoutManager); 92 DISALLOW_COPY_AND_ASSIGN(SystemModalContainerLayoutManager);
92 }; 93 };
93 94
94 } // namespace internal 95 } // namespace internal
95 } // namespace ash 96 } // namespace ash
96 97
97 #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ 98 #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_dispatcher_win.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698