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

Side by Side Diff: content/browser/web_contents/web_contents_view_android.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_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/port/browser/render_view_host_delegate_view.h" 9 #include "content/port/browser/render_view_host_delegate_view.h"
10 #include "content/public/browser/web_contents_view.h" 10 #include "content/public/browser/web_contents_view.h"
(...skipping 28 matching lines...) Expand all
39 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 39 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
40 virtual void SetPageTitle(const string16& title) OVERRIDE; 40 virtual void SetPageTitle(const string16& title) OVERRIDE;
41 virtual void OnTabCrashed(base::TerminationStatus status, 41 virtual void OnTabCrashed(base::TerminationStatus status,
42 int error_code) OVERRIDE; 42 int error_code) OVERRIDE;
43 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 43 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
44 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; 44 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
45 virtual void Focus() OVERRIDE; 45 virtual void Focus() OVERRIDE;
46 virtual void SetInitialFocus() OVERRIDE; 46 virtual void SetInitialFocus() OVERRIDE;
47 virtual void StoreFocus() OVERRIDE; 47 virtual void StoreFocus() OVERRIDE;
48 virtual void RestoreFocus() OVERRIDE; 48 virtual void RestoreFocus() OVERRIDE;
49 virtual bool IsDoingDrag() const OVERRIDE;
50 virtual void CancelDragAndCloseTab() OVERRIDE;
51 virtual WebDropData* GetDropData() const OVERRIDE; 49 virtual WebDropData* GetDropData() const OVERRIDE;
52 virtual bool IsEventTracking() const OVERRIDE; 50 virtual bool IsEventTracking() const OVERRIDE;
53 virtual void CloseTabAfterEventTracking() OVERRIDE; 51 virtual void CloseTabAfterEventTracking() OVERRIDE;
54 virtual gfx::Rect GetViewBounds() const OVERRIDE; 52 virtual gfx::Rect GetViewBounds() const OVERRIDE;
55 virtual void ConfirmTouchEvent(bool handled) OVERRIDE; 53 virtual void ConfirmTouchEvent(bool handled) OVERRIDE;
56 54
57 // Backend implementation of RenderViewHostDelegateView. 55 // Backend implementation of RenderViewHostDelegateView.
58 virtual void ShowContextMenu( 56 virtual void ShowContextMenu(
59 const ContextMenuParams& params, 57 const ContextMenuParams& params,
60 content::ContextMenuSourceType type) OVERRIDE; 58 content::ContextMenuSourceType type) OVERRIDE;
(...skipping 21 matching lines...) Expand all
82 80
83 // Interface for extensions to WebContentsView. Used to show the context menu. 81 // Interface for extensions to WebContentsView. Used to show the context menu.
84 scoped_ptr<WebContentsViewDelegate> delegate_; 82 scoped_ptr<WebContentsViewDelegate> delegate_;
85 83
86 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 84 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
87 }; 85 };
88 86
89 } // namespace content 87 } // namespace content
90 88
91 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 89 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698