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

Unified Diff: content/renderer/render_view_impl.cc

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 years, 11 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
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 0cb157b8115731ddb023a42a21d55e3fbc6c9a2c..06d15f7445ac589faae68643b66ceab55839b9e4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -739,7 +739,11 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
// along with the RenderView automatically.
devtools_agent_ = new DevToolsAgent(this);
mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
+#if defined(ENABLE_WEB_INTENTS)
intents_host_ = new WebIntentsHost(this);
+#else
+ intents_host_ = NULL;
+#endif
favicon_helper_ = new FaviconHelper(this);
// Create renderer_accessibility_ if needed.
@@ -3924,8 +3928,10 @@ void RenderViewImpl::didCreateScriptContext(WebFrame* frame,
GetContentClient()->renderer()->DidCreateScriptContext(
frame, context, extension_group, world_id);
+#if defined(ENABLE_WEB_INTENTS)
intents_host_->DidCreateScriptContext(
frame, context, extension_group, world_id);
+#endif
}
void RenderViewImpl::willReleaseScriptContext(WebFrame* frame,
@@ -4297,6 +4303,7 @@ void RenderViewImpl::requestStorageQuota(
void RenderViewImpl::registerIntentService(
WebFrame* frame, const WebIntentServiceInfo& service) {
+#if defined(ENABLE_WEB_INTENTS)
webkit_glue::WebIntentServiceData data(service);
if (data.title.empty())
data.title = webview()->mainFrame()->document().title();
@@ -4304,10 +4311,12 @@ void RenderViewImpl::registerIntentService(
Send(new IntentsHostMsg_RegisterIntentService(routing_id_,
data,
user_gesture));
+#endif
}
void RenderViewImpl::dispatchIntent(
WebFrame* frame, const WebIntentRequest& intentRequest) {
+#if defined(ENABLE_WEB_INTENTS)
webkit_glue::WebIntentData intent_data(intentRequest.intent());
// See WebMessagePortChannelImpl::postMessage() and ::OnMessagedQueued()
@@ -4326,6 +4335,7 @@ void RenderViewImpl::dispatchIntent(
int id = intents_host_->RegisterWebIntent(intentRequest);
Send(new IntentsHostMsg_WebIntentDispatch(
routing_id_, intent_data, id));
+#endif
}
bool RenderViewImpl::willCheckAndDispatchMessageEvent(
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698