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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 10966023: Fix the crash that could occur when the window is closed while web contents drag is in progress. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; 56 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
57 virtual void SetPageTitle(const string16& title) OVERRIDE; 57 virtual void SetPageTitle(const string16& title) OVERRIDE;
58 virtual void OnTabCrashed(base::TerminationStatus status, 58 virtual void OnTabCrashed(base::TerminationStatus status,
59 int error_code) OVERRIDE; 59 int error_code) OVERRIDE;
60 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 60 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
61 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE; 61 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
62 virtual void Focus() OVERRIDE; 62 virtual void Focus() OVERRIDE;
63 virtual void SetInitialFocus() OVERRIDE; 63 virtual void SetInitialFocus() OVERRIDE;
64 virtual void StoreFocus() OVERRIDE; 64 virtual void StoreFocus() OVERRIDE;
65 virtual void RestoreFocus() OVERRIDE; 65 virtual void RestoreFocus() OVERRIDE;
66 virtual bool IsDoingDrag() const OVERRIDE;
67 virtual void CancelDragAndCloseTab() OVERRIDE;
68 virtual WebDropData* GetDropData() const OVERRIDE; 66 virtual WebDropData* GetDropData() const OVERRIDE;
69 virtual bool IsEventTracking() const OVERRIDE; 67 virtual bool IsEventTracking() const OVERRIDE;
70 virtual void CloseTabAfterEventTracking() OVERRIDE; 68 virtual void CloseTabAfterEventTracking() OVERRIDE;
71 virtual gfx::Rect GetViewBounds() const OVERRIDE; 69 virtual gfx::Rect GetViewBounds() const OVERRIDE;
72 70
73 // Overridden from RenderViewHostDelegateView: 71 // Overridden from RenderViewHostDelegateView:
74 virtual void ShowContextMenu( 72 virtual void ShowContextMenu(
75 const content::ContextMenuParams& params, 73 const content::ContextMenuParams& params,
76 content::ContextMenuSourceType type) OVERRIDE; 74 content::ContextMenuSourceType type) OVERRIDE;
77 virtual void ShowPopupMenu(const gfx::Rect& bounds, 75 virtual void ShowPopupMenu(const gfx::Rect& bounds,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 127
130 // The WebContentsImpl whose contents we display. 128 // The WebContentsImpl whose contents we display.
131 WebContentsImpl* web_contents_; 129 WebContentsImpl* web_contents_;
132 130
133 content::RenderWidgetHostView* view_; 131 content::RenderWidgetHostView* view_;
134 132
135 scoped_ptr<content::WebContentsViewDelegate> delegate_; 133 scoped_ptr<content::WebContentsViewDelegate> delegate_;
136 134
137 WebKit::WebDragOperationsMask current_drag_op_; 135 WebKit::WebDragOperationsMask current_drag_op_;
138 136
139 // Set to true if we want to close the tab after the system drag operation
140 // has finished.
141 bool close_tab_after_drag_ends_;
142
143 content::WebDragDestDelegate* drag_dest_delegate_; 137 content::WebDragDestDelegate* drag_dest_delegate_;
144 138
145 // We keep track of the render view host we're dragging over. If it changes 139 // We keep track of the render view host we're dragging over. If it changes
146 // during a drag, we need to re-send the DragEnter message. WARNING: 140 // during a drag, we need to re-send the DragEnter message. WARNING:
147 // this pointer should never be dereferenced. We only use it for comparing 141 // this pointer should never be dereferenced. We only use it for comparing
148 // pointers. 142 // pointers.
149 void* current_rvh_for_drag_; 143 void* current_rvh_for_drag_;
150 144
151 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 145 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
152 }; 146 };
153 147
154 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 148 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698