Implement newly designed sign-in related histograms for desktop platorms.

chrome/browser/signin/signin_promo.cc

 // Copyright 2013 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/signin/signin_promo.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 147 matching lines @@
   int show_count = profile->GetPrefs()->GetInteger(
       prefs::kSignInPromoStartupCount);
   show_count++;
   profile->GetPrefs()->SetInteger(prefs::kSignInPromoStartupCount, show_count);
 }
 
 void SetUserSkippedPromo(Profile* profile) {
   profile->GetPrefs()->SetBoolean(prefs::kSignInPromoUserSkipped, true);
 }
 
-GURL GetLandingURL(const char* option, int value) {
-  std::string url = base::StringPrintf("%s/success.html?%s=%d",
-                                       extensions::kGaiaAuthExtensionOrigin,
-                                       option,
-                                       value);
+GURL GetLandingURL(signin_metrics::AccessPoint access_point) {
+  std::string url = base::StringPrintf(
+      "%s/success.html?%s=%d", extensions::kGaiaAuthExtensionOrigin,
+      kSignInPromoQueryKeyAccessPoint, access_point);
+
+  // TODO(gogerald): right now, gaia server needs to distinguish the source from
+  // signin_metrics::SOURCE_START_PAGE, signin_metrics::SOURCE_SETTINGS and
+  // the others to show advanced sync settings, remove them after
+  // switching to Minute Maid sign in flow.
+  if (access_point == signin_metrics::ACCESS_POINT_START_PAGE) {
+    base::StringAppendF(&url, "&%s=%d", kSignInPromoQueryKeySource,
+                        signin_metrics::SOURCE_START_PAGE);
+  } else if (access_point == signin_metrics::ACCESS_POINT_SETTINGS) {
+    base::StringAppendF(&url, "&%s=%d", kSignInPromoQueryKeySource,
+                        signin_metrics::SOURCE_SETTINGS);
+  } else {
+    base::StringAppendF(&url, "&%s=%d", kSignInPromoQueryKeySource,
+                        signin_metrics::SOURCE_OTHERS);
+  }
+
   return GURL(url);
 }
 
-GURL GetPromoURL(signin_metrics::Source source, bool auto_close) {
-  return GetPromoURL(source, auto_close, false /* is_constrained */);
+GURL GetPromoURL(signin_metrics::AccessPoint access_point,
+                 signin_metrics::Reason reason,
+                 bool auto_close) {
+  return GetPromoURL(access_point, reason, auto_close,
+                     false /* is_constrained */);
 }
 
-GURL GetPromoURL(signin_metrics::Source source,
+GURL GetPromoURL(signin_metrics::AccessPoint access_point,
+                 signin_metrics::Reason reason,
                  bool auto_close,
                  bool is_constrained) {
-  DCHECK_NE(signin_metrics::SOURCE_UNKNOWN, source);
+  CHECK(access_point < signin_metrics::ACCESS_POINT_MAX);

[Bernhard Bauer, 2015/12/04 11:06:24]

CHECK_LT for slightly nicer error messages.

[gogerald1, 2015/12/04 20:49:09]

Done.

+  CHECK(reason < signin_metrics::REASON_MAX);
 
   std::string url(chrome::kChromeUIChromeSigninURL);
-  base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
+  base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeyAccessPoint,
+                      access_point);
+  base::StringAppendF(&url, "&%s=%d", kSignInPromoQueryKeyReason, reason);
   if (auto_close)
     base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyAutoClose);
   if (is_constrained)
     base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyConstrained);
   return GURL(url);
 }
 
-GURL GetReauthURL(Profile* profile, const std::string& account_id) {
+GURL GetReauthURL(signin_metrics::AccessPoint access_point,
+                  signin_metrics::Reason reason,
+                  Profile* profile,
+                  const std::string& account_id) {
   AccountInfo info = AccountTrackerServiceFactory::GetForProfile(profile)
                          ->GetAccountInfo(account_id);
-  return GetReauthURLWithEmail(info.email);
+  return GetReauthURLWithEmail(access_point, reason, info.email);
 }
 
-GURL GetReauthURLWithEmail(const std::string& email) {
-  GURL url = signin::GetPromoURL(
-      signin_metrics::SOURCE_REAUTH, true /* auto_close */,
-      true /* is_constrained */);
+GURL GetReauthURLWithEmail(signin_metrics::AccessPoint access_point,
+                           signin_metrics::Reason reason,
+                           const std::string& email) {
+  GURL url = signin::GetPromoURL(access_point, reason, true /* auto_close */,
+                                 true /* is_constrained */);
 
   url = net::AppendQueryParameter(url, "email", email);
   url = net::AppendQueryParameter(url, "validateEmail", "1");
   return net::AppendQueryParameter(url, "readOnlyEmail", "1");
 }
 
 GURL GetNextPageURLForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyContinue, &value)) {
     GURL continue_url = GURL(value);
     if (continue_url.is_valid())
       return continue_url;
   }
 
   return GURL();
 }
 
 GURL GetSigninPartitionURL() {
   return GURL("chrome-guest://chrome-signin/?");
 }
 
 GURL GetSigninURLFromBubbleViewMode(Profile* profile,
-                                    profiles::BubbleViewMode mode) {
+                                    profiles::BubbleViewMode mode,
+                                    signin_metrics::AccessPoint access_point) {
   switch (mode) {
     case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN:
-      return GetPromoURL(signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN,
-                         false /* auto_close */,
-                         true /* is_constrained */);
+      return GetPromoURL(access_point,
+                         signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT,
+                         false /* auto_close */, true /* is_constrained */);
       break;
     case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT:
-      return GetPromoURL(signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT,
-                         false /* auto_close */,
-                         true /* is_constrained */);
+      return GetPromoURL(access_point,
+                         signin_metrics::REASON_ADD_SECONDARY_ACCOUNT,
+                         false /* auto_close */, true /* is_constrained */);
       break;
     case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: {
       const SigninErrorController* error_controller =
           SigninErrorControllerFactory::GetForProfile(profile);
       CHECK(error_controller);
       DCHECK(error_controller->HasError());
-      return GetReauthURL(profile, error_controller->error_account_id());
+      return GetReauthURL(access_point, signin_metrics::REASON_REAUTHENTICATION,
+                          profile, error_controller->error_account_id());
       break;
     }
     default:
       NOTREACHED() << "Called with invalid mode=" << mode;
       return GURL();
   }
 }
 
-signin_metrics::Source GetSourceForPromoURL(const GURL& url) {
+signin_metrics::AccessPoint GetAccessPointForPromoURL(const GURL& url) {
   std::string value;
-  if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeySource, &value)) {
-    int source = 0;
-    if (base::StringToInt(value, &source) &&
-        source >= signin_metrics::SOURCE_START_PAGE &&
-        source < signin_metrics::SOURCE_UNKNOWN) {
-      return static_cast<signin_metrics::Source>(source);
+  if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyAccessPoint,
+                                 &value)) {
+    int access_point = 0;
+    if (base::StringToInt(value, &access_point) &&
+        access_point >= signin_metrics::ACCESS_POINT_START_PAGE &&
+        access_point < signin_metrics::ACCESS_POINT_MAX) {
+      return static_cast<signin_metrics::AccessPoint>(access_point);
     }
+    CHECK(false);
   }
-  return signin_metrics::SOURCE_UNKNOWN;
+  return signin_metrics::ACCESS_POINT_MAX;
+}
+
+signin_metrics::Reason GetSigninReasonForPromoURL(const GURL& url) {
+  std::string value;
+  if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyReason, &value)) {
+    int reason = 0;
+    if (base::StringToInt(value, &reason) &&
+        reason >= signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT &&
+        reason < signin_metrics::REASON_MAX) {
+      return static_cast<signin_metrics::Reason>(reason);
+    }
+    CHECK(false);

[Bernhard Bauer, 2015/12/04 11:06:24]

Move the condition into the CHECK? Also, seeing as the CHECK is always compile
in, the only way to reach the return statement below is if
GetValueForKeyInQuery() returns false, so you could return early in that case.

[gogerald1, 2015/12/04 20:49:09]

Done.

+  }
+  return signin_metrics::REASON_MAX;
 }
 
 bool IsAutoCloseEnabledInURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyAutoClose, &value)) {
     int enabled = 0;
     if (base::StringToInt(value, &enabled) && enabled == 1)
       return true;
   }
   return false;
@@ skipping 16 matching lines @@
 
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
   registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
 }
 
 }  // namespace signin