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

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

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 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 5 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" 8 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h" 10 #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h"
(...skipping 19 matching lines...) Expand all
30 BrowserFrame* browser_frame, 30 BrowserFrame* browser_frame,
31 BrowserView* browser_view) 31 BrowserView* browser_view)
32 : views::DesktopNativeWidgetAura(browser_frame), 32 : views::DesktopNativeWidgetAura(browser_frame),
33 browser_view_(browser_view), 33 browser_view_(browser_view),
34 browser_frame_(browser_frame), 34 browser_frame_(browser_frame),
35 browser_desktop_root_window_host_(NULL) { 35 browser_desktop_root_window_host_(NULL) {
36 GetNativeWindow()->SetName("BrowserFrameAura"); 36 GetNativeWindow()->SetName("BrowserFrameAura");
37 } 37 }
38 38
39 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
40 // DesktopBrowserFrameAura, protected:
41
42 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() {
43 }
44
45 ///////////////////////////////////////////////////////////////////////////////
40 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides: 46 // DesktopBrowserFrameAura, views::DesktopNativeWidgetAura overrides:
41 47
42 void DesktopBrowserFrameAura::InitNativeWidget( 48 void DesktopBrowserFrameAura::InitNativeWidget(
43 const views::Widget::InitParams& params) { 49 const views::Widget::InitParams& params) {
44 browser_desktop_root_window_host_ = 50 browser_desktop_root_window_host_ =
45 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost( 51 BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost(
46 browser_frame_, 52 browser_frame_,
47 this, 53 this,
48 params.bounds, 54 params.bounds,
49 browser_view_, 55 browser_view_,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { 90 bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const {
85 return browser_desktop_root_window_host_->UsesNativeSystemMenu(); 91 return browser_desktop_root_window_host_->UsesNativeSystemMenu();
86 } 92 }
87 93
88 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { 94 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const {
89 return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); 95 return browser_desktop_root_window_host_->GetMinimizeButtonOffset();
90 } 96 }
91 97
92 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() { 98 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() {
93 } 99 }
94
95 ///////////////////////////////////////////////////////////////////////////////
96 // DesktopBrowserFrameAura, private:
97
98 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() {
99 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/desktop_browser_frame_aura.h ('k') | chrome/browser/ui/views/frame/native_browser_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698