Index: content/renderer/web_intents_host.h |
diff --git a/content/renderer/web_intents_host.h b/content/renderer/web_intents_host.h |
index 01164924a22e4b01d6e02bdb7e9fae74494ac2c0..518df9ffa6ee8a3d8e23a9e60f1b7d06fdae450a 100644 |
--- a/content/renderer/web_intents_host.h |
+++ b/content/renderer/web_intents_host.h |
@@ -10,6 +10,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "content/public/renderer/render_view_observer.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlob.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
#include "webkit/glue/web_intent_data.h" |
#include "webkit/glue/web_intent_reply_data.h" |
@@ -44,24 +45,20 @@ class WebIntentsHost : public content::RenderViewObserver { |
void OnFailure(const WebKit::WebString& data); |
private: |
- // A counter used to assign unique IDs to web intents invocations in this |
- // renderer. |
- int id_counter_; |
- |
- // Map tracking registered Web Intent requests by assigned ID numbers to |
- // correctly route any return data. |
- std::map<int, WebKit::WebIntentRequest> intent_requests_; |
- |
// RenderView::Observer implementation. |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE; |
+ // Converts incoming intent data to a WebIntent object. |
+ WebKit::WebIntent CreateWebIntent( |
+ WebKit::WebFrame* frame, const webkit_glue::WebIntentData& intent_data); |
+ |
// TODO(gbillock): Do we need various ***ClientRedirect methods to implement |
// intent cancelling policy? Figure this out. |
// On the service page, handler method for the IntentsMsg_SetWebIntent |
// message. |
- void OnSetIntent(const webkit_glue::WebIntentData& intent); |
+ CONTENT_EXPORT void OnSetIntent(const webkit_glue::WebIntentData& intent); |
// On the client page, handler method for the IntentsMsg_WebIntentReply |
// message. Forwards the reply |data| to the registered WebIntentRequest |
@@ -70,6 +67,16 @@ class WebIntentsHost : public content::RenderViewObserver { |
const WebKit::WebString& data, |
int intent_id); |
+ friend class WebIntentsHostTest; |
+ |
+ // A counter used to assign unique IDs to web intents invocations in this |
+ // renderer. |
+ int id_counter_; |
+ |
+ // Map tracking registered Web Intent requests by assigned ID numbers to |
+ // correctly route any return data. |
+ std::map<int, WebKit::WebIntentRequest> intent_requests_; |
+ |
// Delivered intent data from the caller. |
scoped_ptr<webkit_glue::WebIntentData> intent_; |