Revert "Reusing Ok/Cancel buttons for intent picker"

chrome/browser/chromeos/arc/arc_navigation_throttle.h

Index: chrome/browser/chromeos/arc/arc_navigation_throttle.h
diff --git a/chrome/browser/chromeos/arc/arc_navigation_throttle.h b/chrome/browser/chromeos/arc/arc_navigation_throttle.h
index 18be29a51e610dde611914d4536bbae3b2aa11d1..188cadfecd4fe717ef3d14c2e23b4f00635f210a 100644
--- a/chrome/browser/chromeos/arc/arc_navigation_throttle.h
+++ b/chrome/browser/chromeos/arc/arc_navigation_throttle.h
@@ -47,18 +47,11 @@ class ArcNavigationThrottle : public content::NavigationThrottle {
   // ScrollView.
   enum { kMaxAppResults = 3 };
 
-  struct AppInfo {
-    explicit AppInfo(gfx::Image img, std::string package, std::string activity)
-        : icon(img), package_name(package), activity_name(activity) {}
-    gfx::Image icon;
-    std::string package_name;
-    std::string activity_name;
-  };
-
-  using ShowIntentPickerCallback = base::Callback<void(
-      content::WebContents* web_contents,
-      const std::vector<AppInfo>& app_info,
-      const base::Callback<void(std::string, CloseReason)>& cb)>;
+  using NameAndIcon = std::pair<std::string, gfx::Image>;
+  using ShowIntentPickerCallback =
+      base::Callback<void(content::WebContents* web_contents,
+                          const std::vector<NameAndIcon>& app_info,
+                          const base::Callback<void(size_t, CloseReason)>& cb)>;
   ArcNavigationThrottle(content::NavigationHandle* navigation_handle,
                         const ShowIntentPickerCallback& show_intent_picker_cb);
   ~ArcNavigationThrottle() override;
@@ -78,7 +71,7 @@ class ArcNavigationThrottle : public content::NavigationThrottle {
       mojo::Array<mojom::IntentHandlerInfoPtr> handlers,
       std::unique_ptr<ActivityIconLoader::ActivityToIconsMap> icons);
   void OnIntentPickerClosed(mojo::Array<mojom::IntentHandlerInfoPtr> handlers,
-                            std::string selected_app_package,
+                            size_t selected_app_index,
                             CloseReason close_reason);
   // A callback object that allow us to display an IntentPicker when Run() is
   // executed, it also allow us to report the user's selection back to