Delete Android content detectors.

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 163 matching lines @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/latency/latency_info.h"
 #include "url/origin.h"
 #include "url/url_constants.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "base/android/build_info.h"
-#include "content/renderer/android/address_detector.h"
-#include "content/renderer/android/content_detector.h"
 #include "content/renderer/android/disambiguation_popup_helper.h"
-#include "content/renderer/android/email_detector.h"
-#include "content/renderer/android/phone_number_detector.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 #elif defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/pepper_plugin_registry.h"
 #endif
@@ skipping 78 matching lines @@
 // state and scroll position) to the browser. We delay sending changes to avoid
 // spamming the browser.
 // To avoid having tab/session restore require sending a message to get the
 // current content state during tab closing we use a shorter timeout for the
 // foreground renderer. This means there is a small window of time from which
 // content state is modified and not sent to session restore, but this is
 // better than having to wake up all renderers during shutdown.
 const int kDelaySecondsForContentStateSyncHidden = 5;
 const int kDelaySecondsForContentStateSync = 1;
 
-#if defined(OS_ANDROID)
-// Delay between tapping in content and launching the associated android intent.
-// Used to allow users see what has been recognized as content.
-const size_t kContentIntentDelayMilliseconds = 700;
-#endif
-
 static RenderViewImpl* (*g_create_render_view_impl)(
     CompositorDependencies* compositor_deps,
     const mojom::CreateViewParams&) = nullptr;
 
 // static
 Referrer RenderViewImpl::GetReferrerFromRequest(
     WebFrame* frame,
     const WebURLRequest& request) {
   return Referrer(
       blink::WebStringToGURL(request.httpHeaderField(
@@ skipping 291 matching lines @@
 #endif
       browser_controls_shrink_blink_size_(false),
       top_controls_height_(0.f),
       webview_(nullptr),
       has_scrolled_focused_editable_node_into_rect_(false),
       page_zoom_level_(params.page_zoom_level),
       main_render_frame_(nullptr),
       frame_widget_(nullptr),
       speech_recognition_dispatcher_(NULL),
 #if defined(OS_ANDROID)
-      expected_content_intent_id_(0),
       was_created_by_renderer_(false),
 #endif
       enumeration_completion_id_(0),
       session_storage_namespace_id_(params.session_storage_namespace_id),
       weak_ptr_factory_(this) {
   GetWidget()->set_owner_delegate(this);
 }
 
 void RenderViewImpl::Initialize(
     const mojom::CreateViewParams& params,
@@ skipping 86 matching lines @@
   if (params.proxy_routing_id != MSG_ROUTING_NONE) {
     CHECK(params.swapped_out);
     RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, GetRoutingID(),
                                        opener_frame, MSG_ROUTING_NONE,
                                        params.replicated_frame_state);
   }
 
   if (main_render_frame_)
     main_render_frame_->Initialize();
 
-#if defined(OS_ANDROID)
-  content_detectors_.push_back(base::MakeUnique<AddressDetector>());
-  const std::string& contry_iso =
-      params.renderer_preferences.network_contry_iso;
-  if (!contry_iso.empty()) {
-    content_detectors_.push_back(
-        base::MakeUnique<PhoneNumberDetector>(contry_iso));
-  }
-  content_detectors_.push_back(base::MakeUnique<EmailDetector>());
-#endif
-
   // If this RenderView's creation was initiated by an opener page in this
   // process, (e.g. window.open()), we won't be visible until we ask the opener,
   // via show_callback, to make us visible. Otherwise, we went through a
   // browser-initiated creation, and show() won't be called.
   if (!was_created_by_renderer)
     did_show_ = true;
 
   // Set the main frame's name.  Only needs to be done for WebLocalFrames,
   // since the remote case was handled as part of SetReplicatedState on the
   // proxy above.
@@ skipping 1689 matching lines @@
 
   auto* web_signals = webview()->pageImportanceSignals();
 
   PageImportanceSignals signals;
   signals.had_form_interaction = web_signals->hadFormInteraction();
 
   main_render_frame_->Send(new FrameHostMsg_UpdatePageImportanceSignals(
       main_render_frame_->GetRoutingID(), signals));
 }
 
-// TODO(dglazkov): Remove this ifdef. The content detection code
-// should not be platform-specific.
-// See http://crbug.com/635214 for details.
 #if defined(OS_ANDROID)
-WebURL RenderViewImpl::detectContentIntentAt(
-    const WebHitTestResult& touch_hit) {
-  // TODO(twellington): Remove content detection entirely. It is
-  // currently only enabled for tests. crbug.com/664307.
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableContentIntentDetection)) {
-    return WebURL();
-  }
-  DCHECK(touch_hit.node().isTextNode());
-
-  // Process the position with all the registered content detectors until
-  // a match is found. Priority is provided by their relative order.
-  for (const auto& detector : content_detectors_) {
-    WebURL intent = detector->FindTappedContent(touch_hit);
-    if (intent.isValid()) {
-      return intent;
-    }
-  }
-  return WebURL();
-}
-
-void RenderViewImpl::scheduleContentIntent(const WebURL& intent,
-                                           bool is_main_frame) {
-  // Introduce a short delay so that the user can notice the content.
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, base::Bind(&RenderViewImpl::LaunchAndroidContentIntent,
-                            weak_ptr_factory_.GetWeakPtr(), intent,
-                            expected_content_intent_id_, is_main_frame),
-      base::TimeDelta::FromMilliseconds(kContentIntentDelayMilliseconds));
-}
-
-void RenderViewImpl::cancelScheduledContentIntents() {
-  ++expected_content_intent_id_;
-}
-
-void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent,
-                                                size_t request_id,
-                                                bool is_main_frame) {
-  if (request_id != expected_content_intent_id_)
-    return;
-
-  // Remove the content highlighting if any.
-  if (RenderWidgetCompositor* rwc = compositor())
-    rwc->setNeedsBeginFrame();
-
-  if (!intent.is_empty()) {
-    Send(new ViewHostMsg_StartContentIntent(GetRoutingID(), intent,
-                                            is_main_frame));
-  }
-}
-
 bool RenderViewImpl::openDateTimeChooser(
     const blink::WebDateTimeChooserParams& params,
     blink::WebDateTimeChooserCompletion* completion) {
   // JavaScript may try to open a date time chooser while one is already open.
   if (date_time_picker_client_)
     return false;
   date_time_picker_client_.reset(
       new RendererDateTimePicker(this, params, completion));
   return date_time_picker_client_->Open();
 }
@@ skipping 259 matching lines @@
                             INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   std::unique_ptr<InputEventAck> ack(
       new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(),
                         INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
 }  // namespace content