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

Side by Side Diff: ui/views/widget/desktop_native_widget_helper_aura.h

Issue 10966026: Fix a crash in DesktopNativeWidgetHelperAura when closing tabs because it was dereferncing a delete… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix crash Created 8 years, 3 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/views/widget/desktop_native_widget_helper_aura.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_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
7 7
8 #include "ui/aura/root_window_observer.h" 8 #include "ui/aura/root_window_observer.h"
9 #include "ui/aura/window_observer.h" 9 #include "ui/aura/window_observer.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 static aura::Window* GetViewsWindowForRootWindow(aura::RootWindow* root); 56 static aura::Window* GetViewsWindowForRootWindow(aura::RootWindow* root);
57 57
58 // Overridden from aura::NativeWidgetHelperAura: 58 // Overridden from aura::NativeWidgetHelperAura:
59 virtual void PreInitialize(aura::Window* window, 59 virtual void PreInitialize(aura::Window* window,
60 const Widget::InitParams& params) OVERRIDE; 60 const Widget::InitParams& params) OVERRIDE;
61 virtual void PostInitialize() OVERRIDE; 61 virtual void PostInitialize() OVERRIDE;
62 virtual aura::RootWindow* GetRootWindow() OVERRIDE; 62 virtual aura::RootWindow* GetRootWindow() OVERRIDE;
63 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE; 63 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE;
64 64
65 // Overridden from aura::RootWindowObserver: 65 // Overridden from aura::RootWindowObserver:
66 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
67
68 // Overridden from aura::RootWindowObserver:
66 virtual void OnRootWindowResized(const aura::RootWindow* root, 69 virtual void OnRootWindowResized(const aura::RootWindow* root,
67 const gfx::Size& old_size) OVERRIDE; 70 const gfx::Size& old_size) OVERRIDE;
68 virtual void OnRootWindowMoved(const aura::RootWindow* root, 71 virtual void OnRootWindowMoved(const aura::RootWindow* root,
69 const gfx::Point& new_origin) OVERRIDE; 72 const gfx::Point& new_origin) OVERRIDE;
70 virtual void OnWindowVisibilityChanged(aura::Window* window, 73 virtual void OnWindowVisibilityChanged(aura::Window* window,
71 bool visible) OVERRIDE; 74 bool visible) OVERRIDE;
72 virtual void OnRootWindowHostCloseRequested( 75 virtual void OnRootWindowHostCloseRequested(
73 const aura::RootWindow* root) OVERRIDE; 76 const aura::RootWindow* root) OVERRIDE;
74 77
75 private: 78 private:
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; 116 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_;
114 scoped_ptr<X11DesktopWindowMoveClient> x11_window_move_client_; 117 scoped_ptr<X11DesktopWindowMoveClient> x11_window_move_client_;
115 #endif 118 #endif
116 119
117 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); 120 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura);
118 }; 121 };
119 122
120 } // namespace views 123 } // namespace views
121 124
122 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 125 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/desktop_native_widget_helper_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698