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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 12086095: Fixed drag and drop into and out of Browser Plugin. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed comments Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index f0b3039019282c15f0822198145f4d4ffb08597c..2d6a9ac8280eb8f15caa196d2bb84cd056a7eebf 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -25,6 +25,7 @@
#include "base/compiler_specific.h"
#include "base/id_map.h"
+#include "base/memory/weak_ptr.h"
#include "base/shared_memory.h"
#include "base/time.h"
#include "content/port/common/input_event_ack_state.h"
@@ -57,6 +58,7 @@ namespace content {
class BrowserPluginHostFactory;
class BrowserPluginEmbedder;
+class DragEventSourceInfo;
class RenderProcessHost;
// A browser plugin guest provides functionality for WebContents to operate in
@@ -64,9 +66,11 @@ class RenderProcessHost;
// messages.
//
// BrowserPluginEmbedder is responsible for creating and destroying a guest.
-class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
- public WebContentsDelegate,
- public WebContentsObserver {
+class CONTENT_EXPORT BrowserPluginGuest
+ : public NotificationObserver,
+ public WebContentsDelegate,
+ public WebContentsObserver,
+ public base::SupportsWeakPtr<BrowserPluginGuest> {
public:
virtual ~BrowserPluginGuest();
@@ -260,6 +264,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
int* route_id,
int* surface_id,
int64* cloned_session_storage_namespace_id);
+ void OnDragStopped();
void OnHandleInputEventAck(
WebKit::WebInputEvent::Type event_type,
InputEventAckState ack_result);
@@ -271,9 +276,9 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params);
#endif
void OnShowWidget(int route_id, const gfx::Rect& initial_pos);
+ void OnStartDragging(bool* handled);
// Overriden in tests.
virtual void OnTakeFocus(bool reverse);
- void OnUpdateDragCursor(WebKit::WebDragOperation operation);
void OnUpdateFrameName(int frame_id,
bool is_top_level,
const std::string& name);

Powered by Google App Engine
This is Rietveld 408576698