Add an external protocol dialog for ARC

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 "chrome/browser/chromeos/arc/page_transition_util.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 "components/arc/intent_helper/local_activity_resolver.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 {
@@ skipping 48 matching lines @@
       // No picker has previously been popped up for this - continue.
       break;
   }
   return HandleRequest();
 }
 
 content::NavigationThrottle::ThrottleCheckResult
 ArcNavigationThrottle::HandleRequest() {
   const GURL& url = navigation_handle()->GetURL();
 
-  // Mask out any redirect qualifiers - this method handles navigation from
-  // redirect and non-redirect navigations equivalently.
-  const ui::PageTransition transition =

[Luis Héctor Chávez, 2016/09/15 22:42:11]

Naïve question: shouldn't there be a if (ShouldIgnoreNavigation(...)) return
...PROCEED;  here?

[Yusuke Sato, 2016/09/15 23:08:24]

Done.

I moved it to line 247 but it was probably more difficult to read.

-      ui::PageTransitionFromInt(navigation_handle()->GetPageTransition() &
-                                ~ui::PAGE_TRANSITION_IS_REDIRECT_MASK);
-
-  if (!ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_LINK)) {
-    // Allow navigation to proceed if this event wasn't spawned by the user
-    // clicking on a link.
-    return content::NavigationThrottle::PROCEED;
-  }
-
-  if (ui::PageTransitionGetQualifier(transition) != 0) {
-    // Qualifiers indicate that this navigation was the result of a click on a
-    // forward/back button, or typing in the URL bar, etc.  Don't pass any of
-    // those types of navigations to the intent helper (see crbug.com/630072).
-    // Note that redirects, which we do pass on, are masked out above.
-    return content::NavigationThrottle::PROCEED;
-  }
-
   if (!ShouldOverrideUrlLoading(navigation_handle()))
     return content::NavigationThrottle::PROCEED;
 
   arc::ArcServiceManager* arc_service_manager = arc::ArcServiceManager::Get();
   DCHECK(arc_service_manager);
   scoped_refptr<arc::LocalActivityResolver> local_resolver =
       arc_service_manager->activity_resolver();
   if (local_resolver->ShouldChromeHandleUrl(url)) {
     // Allow navigation to proceed if there isn't an android app that handles
     // the given URL.
@@ skipping 145 matching lines @@
     }
   }
 
   UMA_HISTOGRAM_ENUMERATION("Arc.IntentHandlerAction",
                             static_cast<int>(close_reason),
                             static_cast<int>(CloseReason::SIZE));
 }
 
 bool ArcNavigationThrottle::ShouldOverrideUrlLoading(
     content::NavigationHandle* navigation_handle) {
+  if (ShouldIgnoreNavigation(navigation_handle->GetPageTransition()))
+    return false;
+
   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