Ensure that Chrome is visible in the dialog by default

chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc

Index: chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
index d2fe421f4839202f1bebea1710055657239c34aa..11be10a41ede9d3fe32fb052f65054b18d93dfe6 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
@@ -329,7 +329,15 @@ void OnUrlHandlerList(int render_process_host_id,
     return;  // the |url| has been handled.
   }
 
-  // Otherwise, retrieve icons of the activities.
+  // Otherwise, retrieve icons of the activities. First, swap |handler| elements
+  // to ensure Chrome is visible in the UI by default. Since this function is
+  // for handling external protocols, Chrome is rarely in the list, but if the
+  // |url| is intent: with fallback or geo:, for example, it may be.
+  std::pair<size_t, size_t> indices;
+  if (ArcNavigationThrottle::IsSwapElementsNeeded(handlers, &indices))
+    std::swap(handlers[indices.first], handlers[indices.second]);
+
+  // Then request the icons.
   std::vector<ActivityIconLoader::ActivityName> activities;
   for (const auto& handler : handlers) {
     activities.emplace_back(handler->package_name, handler->activity_name);