Remove web intents from Chrome on Android build

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2835 matching lines @@
         break;
       }
     }
 
     if (rph_delegate != NULL)
       infobar_helper->AddInfoBar(rph_delegate);
   }
 }
 
 // static
 void Browser::RegisterIntentHandlerHelper(WebContents* tab,

[Ben Goodger (Google), 2012/03/08 23:32:38]

Since this is a static function, does it really need to live on Browser? I'd
suggest moving it off into its own file browser/ui/intents.cc in the browser
namespace, and then not building that file on android. That way we can avoid
these ifdefs here.

[Jesse Greenwald, 2012/03/10 00:13:26]

Done.

                                           const string16& action,
                                           const string16& type,
                                           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;
 
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (!tcw || tcw->profile()->IsOffTheRecord())
     return;
 
   FaviconService* favicon_service =
       tcw->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
@@ skipping 11 matching lines @@
   service.type = type;
   service.title = title;
   service.setDisposition(disposition);
 
   RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
       tcw->infobar_tab_helper(),
       WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
       service,
       favicon_service,
       tab->GetURL());
+#endif // defined(OS_ANDROID)
 }
 
 // static
 void Browser::FindReplyHelper(WebContents* tab,
                               int request_id,
                               int number_of_matches,
                               const gfx::Rect& selection_rect,
                               int active_match_ordinal,
                               bool final_update) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
@@ skipping 1299 matching lines @@
                                     const string16& action,
                                     const string16& type,
                                     const string16& href,
                                     const string16& title,
                                     const string16& disposition) {
   RegisterIntentHandlerHelper(tab, action, type, href, title, disposition);
 }
 
 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;
 
   TabContentsWrapper* tcw =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   tcw->web_intent_picker_controller()->SetIntentsDispatcher(intents_dispatcher);
   tcw->web_intent_picker_controller()->ShowDialog(
       this,
       intents_dispatcher->GetIntent().action,
       intents_dispatcher->GetIntent().type);
+#endif // !defined(OS_ANDROID)
 }
 
 void Browser::FindReply(WebContents* tab,
                         int request_id,
                         int number_of_matches,
                         const gfx::Rect& selection_rect,
                         int active_match_ordinal,
                         bool final_update) {
   FindReplyHelper(tab, request_id, number_of_matches, selection_rect,
                   active_match_ordinal, final_update);
@@ skipping 1414 matching lines @@
     ShowSingletonTabOverwritingNTP(params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI();
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }