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

Side by Side Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h

Issue 23523018: Fixes use after free during drag and drop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 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
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 CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
(...skipping 24 matching lines...) Expand all
35 // 35 //
36 class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura, 36 class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
37 public NativeBrowserFrame { 37 public NativeBrowserFrame {
38 public: 38 public:
39 DesktopBrowserFrameAura(BrowserFrame* browser_frame, 39 DesktopBrowserFrameAura(BrowserFrame* browser_frame,
40 BrowserView* browser_view); 40 BrowserView* browser_view);
41 41
42 BrowserView* browser_view() const { return browser_view_; } 42 BrowserView* browser_view() const { return browser_view_; }
43 43
44 protected: 44 protected:
45 virtual ~DesktopBrowserFrameAura();
46
45 // Overridden from views::DesktopNativeWidgetAura: 47 // Overridden from views::DesktopNativeWidgetAura:
46 virtual void InitNativeWidget( 48 virtual void InitNativeWidget(
47 const views::Widget::InitParams& params) OVERRIDE; 49 const views::Widget::InitParams& params) OVERRIDE;
48 virtual void OnWindowDestroying() OVERRIDE; 50 virtual void OnWindowDestroying() OVERRIDE;
49 51
50 // Overridden from NativeBrowserFrame: 52 // Overridden from NativeBrowserFrame:
51 virtual views::NativeWidget* AsNativeWidget() OVERRIDE; 53 virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
52 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE; 54 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
53 virtual bool UsesNativeSystemMenu() const OVERRIDE; 55 virtual bool UsesNativeSystemMenu() const OVERRIDE;
54 virtual int GetMinimizeButtonOffset() const OVERRIDE; 56 virtual int GetMinimizeButtonOffset() const OVERRIDE;
55 virtual void TabStripDisplayModeChanged() OVERRIDE; 57 virtual void TabStripDisplayModeChanged() OVERRIDE;
56 58
57 private: 59 private:
58 virtual ~DesktopBrowserFrameAura();
59
60 // The BrowserView is our ClientView. This is a pointer to it. 60 // The BrowserView is our ClientView. This is a pointer to it.
61 BrowserView* browser_view_; 61 BrowserView* browser_view_;
62 BrowserFrame* browser_frame_; 62 BrowserFrame* browser_frame_;
63 63
64 // Owned by the RootWindow. 64 // Owned by the RootWindow.
65 BrowserDesktopRootWindowHost* browser_desktop_root_window_host_; 65 BrowserDesktopRootWindowHost* browser_desktop_root_window_host_;
66 66
67 scoped_ptr<aura::client::UserActionClient> user_action_client_; 67 scoped_ptr<aura::client::UserActionClient> user_action_client_;
68 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 68 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); 70 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
71 }; 71 };
72 72
73 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 73 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.cc ('k') | chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698