Adding a destination platform histogram for UMA.

chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.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/intent_helper/arc_external_protocol_dialog.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 22 matching lines @@
 using content::WebContents;
 
 namespace arc {
 
 namespace {
 
 constexpr uint32_t kMinVersionForHandleUrl = 2;
 constexpr uint32_t kMinVersionForRequestUrlHandlerList = 2;
 constexpr uint32_t kMinVersionForAddPreferredPackage = 7;
 
-void RecordUma(ArcNavigationThrottle::CloseReason close_reason) {
+void RecordUma(ArcNavigationThrottle::CloseReason close_reason,
+               ArcNavigationThrottle::Platform platform) {
   UMA_HISTOGRAM_ENUMERATION(
       "Arc.IntentHandlerAction", static_cast<int>(close_reason),
       static_cast<int>(ArcNavigationThrottle::CloseReason::SIZE));
+
+  UMA_HISTOGRAM_ENUMERATION(
+      "Arc.IntentHandlerDestinationPlatform", static_cast<int>(platform),
+      static_cast<int>(ArcNavigationThrottle::Platform::SIZE));

[Ilya Sherman, 2016/11/05 01:39:22]

nit: Are these static casts needed?  I thought I remembered some template magic
landing that made them no longer necessary.

[Ilya Sherman, 2016/11/05 01:39:22]

It looks like you emit this same histogram both here and in
arc_navigation_throttle.cc.  Could you please refactor the code to be shared?

[djacobo_, 2016/11/05 04:24:53]

True, very nice catch. Done.

[djacobo_, 2016/11/05 04:24:53]

didnt work :'( could revisit later.

 }
 
 // Shows the Chrome OS' original external protocol dialog as a fallback.
 void ShowFallbackExternalProtocolDialog(int render_process_host_id,
                                         int routing_id,
                                         const GURL& url) {
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, routing_id);
   new ExternalProtocolDialog(web_contents, url);
 }
@@ skipping 207 matching lines @@
                  << ", handlers.size=" << handlers.size();
       // fall through.
     }
     case ArcNavigationThrottle::CloseReason::DIALOG_DEACTIVATED: {
       // The user didn't select any ARC activity. Show the Chrome OS dialog.
       ShowFallbackExternalProtocolDialog(render_process_host_id, routing_id,
                                          url);
       break;
     }
   }
-  RecordUma(close_reason);
+
+  ArcNavigationThrottle::Platform platform =
+      ArcNavigationThrottle::GetDestinationPlatform(selected_app_package,
+                                                    close_reason);
+  RecordUma(close_reason, platform);
 }
 
 // Called when ARC returned activity icons for the |handlers|.
 void OnAppIconsReceived(
     int render_process_host_id,
     int routing_id,
     const GURL& url,
     mojo::Array<mojom::IntentHandlerInfoPtr> handlers,
     std::unique_ptr<ActivityIconLoader::ActivityToIconsMap> icons) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 32 matching lines @@
   if (!instance || !icon_loader) {
     // ARC is not running anymore. Show the Chrome OS dialog.
     ShowFallbackExternalProtocolDialog(render_process_host_id, routing_id, url);
     return;
   }
 
   // Check if the |url| should be handled right away without showing the UI.
   GetActionResult result;
   if (HandleUrl(render_process_host_id, routing_id, url, handlers,
                 handlers.size(), &result)) {
-    if (result == GetActionResult::HANDLE_URL_IN_ARC)
-      RecordUma(ArcNavigationThrottle::CloseReason::PREFERRED_ACTIVITY_FOUND);
+    if (result == GetActionResult::HANDLE_URL_IN_ARC) {
+      RecordUma(ArcNavigationThrottle::CloseReason::PREFERRED_ACTIVITY_FOUND,
+                ArcNavigationThrottle::Platform::ARC);
+    }
     return;  // the |url| has been handled.
   }
 
   // Otherwise, retrieve icons of the activities.
   std::vector<ActivityIconLoader::ActivityName> activities;
   for (const auto& handler : handlers) {
     activities.emplace_back(handler->package_name, handler->activity_name);
   }
   icon_loader->GetActivityIcons(
       activities, base::Bind(OnAppIconsReceived, render_process_host_id,
@@ skipping 54 matching lines @@
 GetActionResult GetActionForTesting(
     const GURL& original_url,
     const mojo::Array<mojom::IntentHandlerInfoPtr>& handlers,
     size_t selected_app_index,
     std::pair<GURL, std::string>* out_url_and_package) {
   return GetAction(original_url, handlers, selected_app_index,
                    out_url_and_package);
 }
 
 }  // namespace arc