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

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 339 matching lines @@
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
 void ShowSearchEngineSettings(Browser* browser) {
   content::RecordAction(UserMetricsAction("EditSearchEngines"));
   ShowSettingsSubPage(browser, kSearchEnginesSubPage);
 }
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
-void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {
+void ShowBrowserSignin(Browser* browser,
+                       signin_metrics::AccessPoint access_point) {
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   // If the browser's profile is an incognito profile, make sure to use
   // a browser window from the original profile.  The user cannot sign in
   // from an incognito window.
   bool switched_browser = false;
   scoped_ptr<ScopedTabbedBrowserDisplayer> displayer;
   if (browser->profile()->IsOffTheRecord()) {
     switched_browser = true;
     displayer.reset(new ScopedTabbedBrowserDisplayer(
         original_profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
     browser = displayer->browser();
   }
 
-  signin_metrics::LogSigninSource(source);
-
-  // Since the app launcher is a separate application, it might steal focus
+  // Since the extension is a separate application, it might steal focus
   // away from Chrome, and accidentally close the avatar bubble. The same will
   // happen if we had to switch browser windows to show the sign in page. In
   // this case, fallback to the full-tab signin page.
   bool show_avatar_bubble =
-      source != signin_metrics::SOURCE_APP_LAUNCHER && !switched_browser;
+      access_point != signin_metrics::ACCESS_POINT_EXTENSIONS &&
+      !switched_browser;
 #if defined(OS_CHROMEOS)
   // ChromeOS doesn't have the avatar bubble.
   show_avatar_bubble = false;
 #endif
 
   if (show_avatar_bubble) {
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
-        signin::ManageAccountsParams());
+        signin::ManageAccountsParams(), access_point);
   } else {
-    NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
+    NavigateToSingletonTab(
+        browser, GURL(signin::GetPromoURL(

[sky, 2015/12/03 22:45:28]

Doesn't GetPromoURL return a GURL?

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

Done. Both the old and new code return a GURL.

+                     access_point,
+                     signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false)));
     DCHECK_GT(browser->tab_strip_model()->count(), 0);
   }
 }
 
-void ShowBrowserSigninOrSettings(
-    Browser* browser,
-    signin_metrics::Source source) {
+void ShowBrowserSigninOrSettings(Browser* browser,
+                                 signin_metrics::AccessPoint access_point) {
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
-    ShowBrowserSignin(browser, source);
+    ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome