[arc-intents] Adjust link-click detection code.

chrome/browser/chromeos/arc/arc_navigation_throttle.cc

 // Copyright 2016 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/chromeos/arc/arc_navigation_throttle.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "ui/base/page_transition_types.h"
 
 namespace arc {
 
 namespace {
 
 constexpr int kMinInstanceVersion = 7;
 
 scoped_refptr<ActivityIconLoader> GetIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
@@ skipping 27 matching lines @@
     const ShowDisambigDialogCallback& show_disambig_dialog_cb)
     : content::NavigationThrottle(navigation_handle),
       show_disambig_dialog_callback_(show_disambig_dialog_cb),
       weak_ptr_factory_(this) {}
 
 ArcNavigationThrottle::~ArcNavigationThrottle() = default;
 
 content::NavigationThrottle::ThrottleCheckResult
 ArcNavigationThrottle::WillStartRequest() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  if (!navigation_handle()->HasUserGesture())
+
+  const ui::PageTransition transition =
+      navigation_handle()->GetPageTransition();
+
+  if (!ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_LINK)) {
+    // If this navigation event wasn't spawned by the user clicking on a link.
     return content::NavigationThrottle::PROCEED;
+  }
 
-  if (!ShouldOverrideUrlLoading(navigation_handle()))
+  if (ui::PageTransitionGetQualifier(transition) != 0) {
+    // Qualifiers indicate that this navigation was the result of a click on a
+    // forward/back button, or a redirect, or typing in the URL bar, etc.  Don't
+    // pass any of those types of navigations to the intent helper (but see
+    // b/29250054).

[Luis Héctor Chávez, 2016/07/22 19:08:18]

Can you put all the accumulated knowledge in crbug.com/630072 (and change this
link to the public bug)?

[Ben Kwa, 2016/07/22 20:16:43]

Done.

     return content::NavigationThrottle::PROCEED;
+  }
+
+  if (!ShouldOverrideUrlLoading(navigation_handle())) {
+    return content::NavigationThrottle::PROCEED;

[Luis Héctor Chávez, 2016/07/22 19:08:18]

nit: remove the braces to see if the diff becomes prettier.

[Ben Kwa, 2016/07/22 20:16:43]

Done.

+  }
 
   const GURL& url = navigation_handle()->GetURL();
   mojom::IntentHelperInstance* bridge_instance = GetIntentHelper();
   if (!bridge_instance)
     return content::NavigationThrottle::PROCEED;
   bridge_instance->RequestUrlHandlerList(
       url.spec(), base::Bind(&ArcNavigationThrottle::OnAppCandidatesReceived,
                              weak_ptr_factory_.GetWeakPtr()));
   return content::NavigationThrottle::DEFER;
 }
@@ skipping 144 matching lines @@
 bool ArcNavigationThrottle::ShouldOverrideUrlLoading(
     content::NavigationHandle* navigation_handle) {
   GURL previous_url = navigation_handle->GetReferrer().url;
   GURL current_url = navigation_handle->GetURL();
   return !net::registry_controlled_domains::SameDomainOrHost(
       current_url, previous_url,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace arc