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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.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: Patch to land Created 8 years, 2 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_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 71 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
72 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE; 72 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
73 virtual void SetPageTitle(const string16& title) OVERRIDE; 73 virtual void SetPageTitle(const string16& title) OVERRIDE;
74 virtual void OnTabCrashed(base::TerminationStatus status, 74 virtual void OnTabCrashed(base::TerminationStatus status,
75 int error_code) OVERRIDE; 75 int error_code) OVERRIDE;
76 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 76 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
77 virtual void Focus() OVERRIDE; 77 virtual void Focus() OVERRIDE;
78 virtual void SetInitialFocus() OVERRIDE; 78 virtual void SetInitialFocus() OVERRIDE;
79 virtual void StoreFocus() OVERRIDE; 79 virtual void StoreFocus() OVERRIDE;
80 virtual void RestoreFocus() OVERRIDE; 80 virtual void RestoreFocus() OVERRIDE;
81 virtual bool IsDoingDrag() const OVERRIDE;
82 virtual void CancelDragAndCloseTab() OVERRIDE;
83 virtual WebDropData* GetDropData() const OVERRIDE; 81 virtual WebDropData* GetDropData() const OVERRIDE;
84 virtual bool IsEventTracking() const OVERRIDE; 82 virtual bool IsEventTracking() const OVERRIDE;
85 virtual void CloseTabAfterEventTracking() OVERRIDE; 83 virtual void CloseTabAfterEventTracking() OVERRIDE;
86 virtual gfx::Rect GetViewBounds() const OVERRIDE; 84 virtual gfx::Rect GetViewBounds() const OVERRIDE;
87 85
88 // Backend implementation of RenderViewHostDelegateView. 86 // Backend implementation of RenderViewHostDelegateView.
89 virtual void ShowContextMenu( 87 virtual void ShowContextMenu(
90 const content::ContextMenuParams& params, 88 const content::ContextMenuParams& params,
91 content::ContextMenuSourceType type) OVERRIDE; 89 content::ContextMenuSourceType type) OVERRIDE;
92 virtual void ShowPopupMenu(const gfx::Rect& bounds, 90 virtual void ShowPopupMenu(const gfx::Rect& bounds,
(...skipping 29 matching lines...) Expand all
122 // focus returns. 120 // focus returns.
123 scoped_nsobject<FocusTracker> focus_tracker_; 121 scoped_nsobject<FocusTracker> focus_tracker_;
124 122
125 // Our optional delegate. 123 // Our optional delegate.
126 scoped_ptr<content::WebContentsViewDelegate> delegate_; 124 scoped_ptr<content::WebContentsViewDelegate> delegate_;
127 125
128 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 126 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
129 }; 127 };
130 128
131 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 129 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698