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

chrome/browser/ui/webui/options/sync_setup_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_header_helper.h"
-#include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "grit/components_strings.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 272 matching lines @@
   web_ui()->RegisterMessageCallback("SyncSetupStopSyncing",
       base::Bind(&SyncSetupHandler::HandleStopSyncing,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("SyncSetupStartSignIn",
       base::Bind(&SyncSetupHandler::HandleStartSignin,
                  base::Unretained(this)));
 #endif
 }
 
 #if !defined(OS_CHROMEOS)
-void SyncSetupHandler::DisplayGaiaLogin() {
+void SyncSetupHandler::DisplayGaiaLogin(
+    signin_metrics::AccessPoint access_point) {
   DCHECK(!sync_startup_tracker_);
   // Advanced options are no longer being configured if the login screen is
   // visible. If the user exits the signin wizard after this without
   // configuring sync, CloseSyncSetup() will ensure they are logged out.
   configuring_sync_ = false;
-  DisplayGaiaLoginInNewTabOrWindow();
+  DisplayGaiaLoginInNewTabOrWindow(access_point);
 }
 
-void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {
+void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow(
+    signin_metrics::AccessPoint access_point) {
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   bool force_new_tab = false;
   if (!browser) {
     // Settings is not displayed in a browser window. Open a new window.
     browser = new Browser(Browser::CreateParams(
         Browser::TYPE_TABBED, GetProfile(), chrome::GetActiveDesktop()));
     force_new_tab = true;
   }
 
   // If the signin manager already has an authenticated username, this is a
   // re-auth scenario, and we need to ensure that the user signs in with the
   // same email address.
   GURL url;
   if (SigninManagerFactory::GetForProfile(
       browser->profile())->IsAuthenticated()) {
     UMA_HISTOGRAM_ENUMERATION("Signin.Reauth",
                               signin_metrics::HISTOGRAM_REAUTH_SHOWN,
                               signin_metrics::HISTOGRAM_REAUTH_MAX);
 
     SigninErrorController* error_controller =
         SigninErrorControllerFactory::GetForProfile(browser->profile());
     DCHECK(error_controller->HasError());
     if (!force_new_tab) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,
-          signin::ManageAccountsParams());
+          signin::ManageAccountsParams(), access_point);
     } else {
-      url = signin::GetReauthURL(browser->profile(),
-                                 error_controller->error_account_id());
+      url = signin::GetReauthURL(
+          access_point, signin_metrics::REASON_REAUTHENTICATION,
+          browser->profile(), error_controller->error_account_id());
     }
   } else {
-    signin_metrics::LogSigninSource(signin_metrics::SOURCE_SETTINGS);
     if (!force_new_tab) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
-          signin::ManageAccountsParams());
+          signin::ManageAccountsParams(), access_point);
     } else {
-      url = signin::GetPromoURL(signin_metrics::SOURCE_SETTINGS, true);
+      url = signin::GetPromoURL(
+          access_point, signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, true);
     }
   }
 
   if (url.is_valid())
     chrome::ShowSingletonTab(browser, url);
 }
 #endif
 
 bool SyncSetupHandler::PrepareSyncSetup() {
   // If the wizard is already visible, just focus that one.
@@ skipping 224 matching lines @@
   // blank setup overlay on this page by showing the "done" page. This can
   // happen if the user navigates to chrome://settings/syncSetup in more than
   // one tab. See crbug.com/261566.
   // Note: The following block will transfer focus to the existing wizard.
   if (IsExistingWizardPresent() && !IsActiveLogin())
     CloseUI();
 
   // If a setup wizard is present on this page or another, bring it to focus.
   // Otherwise, display a new one on this page.
   if (!FocusExistingWizardIfPresent())
-    OpenSyncSetup();
+    OpenSyncSetup(args);
 }
 
 #if defined(OS_CHROMEOS)
 // On ChromeOS, we need to sign out the user session to fix an auth error, so
 // the user goes through the real signin flow to generate a new auth token.
 void SyncSetupHandler::HandleDoSignOutOnAuthError(const base::ListValue* args) {
   DVLOG(1) << "Signing out the user to fix a sync error.";
   chrome::AttemptUserExit();
 }
 #endif
 
 #if !defined(OS_CHROMEOS)
 void SyncSetupHandler::HandleStartSignin(const base::ListValue* args) {
   // Should only be called if the user is not already signed in.
   DCHECK(!SigninManagerFactory::GetForProfile(GetProfile())->
       IsAuthenticated());
-  OpenSyncSetup();
+  OpenSyncSetup(args);
 }
 
 void SyncSetupHandler::HandleStopSyncing(const base::ListValue* args) {
   if (GetSyncService())
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   SigninManagerFactory::GetForProfile(GetProfile())->SignOut(
       signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS);
 
   bool delete_profile = false;
   if (args->GetBoolean(0, &delete_profile) && delete_profile) {
@@ skipping 51 matching lines @@
 
   // Alert the sync service anytime the sync setup dialog is closed. This can
   // happen due to the user clicking the OK or Cancel button, or due to the
   // dialog being closed by virtue of sync being disabled in the background.
   if (sync_service)
     sync_service->SetSetupInProgress(false);
 
   configuring_sync_ = false;
 }
 
-void SyncSetupHandler::OpenSyncSetup() {
+void SyncSetupHandler::OpenSyncSetup(const base::ListValue* args) {
   if (!PrepareSyncSetup())
     return;
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo.
   // 2) Normal signin through settings page (IsAuthenticated() is false).
   // 3) Previously working credentials have expired.
   // 4) User is signed in, but has stopped sync via the google dashboard, and
   //    signout is prohibited by policy so we need to force a re-auth.
   // 5) User clicks [Advanced Settings] button on options page while already
   //    logged in.
   // 6) One-click signin (credentials are already available, so should display
   //    sync configure UI, not login UI).
   // 7) User re-enables sync after disabling it via advanced settings.
 #if !defined(OS_CHROMEOS)
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(GetProfile());
 
   if (!signin->IsAuthenticated() ||
       SigninErrorControllerFactory::GetForProfile(GetProfile())->HasError()) {
     // User is not logged in (cases 1-2), or login has been specially requested
     // because previously working credentials have expired (case 3). Close sync
     // setup including any visible overlays, and display the gaia auth page.
     // Control will be returned to the sync settings page once auth is complete.
     CloseUI();
-    DisplayGaiaLogin();
+    if (args != NULL) {

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

Just do `if (args)` directly.

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

Done.

+      std::string access_point = base::UTF16ToUTF8(ExtractStringValue(args));
+      if (access_point == "access-point-supervised-user") {
+        DisplayGaiaLogin(signin_metrics::ACCESS_POINT_SUPERVISED_USER);
+        return;
+      }
+    }
+    DisplayGaiaLogin(signin_metrics::ACCESS_POINT_SETTINGS);
     return;
   }
 #endif
   if (!GetSyncService()) {
     // This can happen if the user directly navigates to /settings/syncSetup.
     DLOG(WARNING) << "Cannot display sync UI when sync is disabled";
     CloseUI();
     return;
   }
 
@@ skipping 162 matching lines @@
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 
   // Make sure the tab used for the Gaia sign in does not cover the settings
   // tab.
   FocusUI();
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }