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

Unified Diff: chrome/browser/ui/browser.cc

Issue 9521013: Remove web intents from Chrome on Android build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Exclude 'browser/intents' from Android build as well. Created 8 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: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f8a99437c864cc2a7c13e7ff4df043fc7f26eb11..17d65f8e7379a98b0436db91ecadf014cfa148f1 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2833,6 +2833,11 @@ void Browser::RegisterIntentHandlerHelper(WebContents* tab,
const string16& href,
const string16& title,
const string16& disposition) {
+ // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
+ // Android build.
+#if defined(OS_ANDROID)
+ return;
+#else
if (!web_intents::IsWebIntentsEnabled())
return;
@@ -2864,6 +2869,7 @@ void Browser::RegisterIntentHandlerHelper(WebContents* tab,
service,
favicon_service,
tab->GetURL());
+#endif
James Hawkins 2012/03/08 05:21:22 // defined(OS_ANDROID) Here and elsewhere.
Jesse Greenwald 2012/03/08 18:35:28 Done.
}
// static
@@ -4183,6 +4189,9 @@ void Browser::RegisterIntentHandler(WebContents* tab,
void Browser::WebIntentDispatch(
WebContents* tab, content::WebIntentsDispatcher* intents_dispatcher) {
+ // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
+ // Android build.
+#if !defined(OS_ANDROID)
if (!web_intents::IsWebIntentsEnabled())
return;
@@ -4193,6 +4202,7 @@ void Browser::WebIntentDispatch(
this,
intents_dispatcher->GetIntent().action,
intents_dispatcher->GetIntent().type);
+#endif
}
void Browser::FindReply(WebContents* tab,

Powered by Google App Engine
This is Rietveld 408576698