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

Unified Diff: content/renderer/web_intents_host.h

Issue 11026070: Add API to construct new vector interchange MIME data type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comment changes 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 side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698