| Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| index 5fc7301acb220e99466b0a7e81e5616eb344cfc4..a4ec39487f9c984e1fbbb5b8e0f9fe71554038b8 100644
|
| --- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/profiles/profile_avatar_icon_util.h"
|
| #include "chrome/browser/profiles/profile_info_cache.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/profiles/profile_metrics.h"
|
| #include "chrome/browser/profiles/profile_window.h"
|
| #include "chrome/browser/profiles/profiles_state.h"
|
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
|
| @@ -529,8 +530,13 @@ void ProfileChooserView::ButtonPressed(views::Button* sender,
|
| // is indeed shown for the maximum number of times.
|
| browser_->profile()->GetPrefs()->SetInteger(
|
| prefs::kProfileAvatarTutorialShown, kProfileAvatarTutorialShowMax + 1);
|
| +
|
| + ProfileMetrics::LogProfileMirrorEnrollment(
|
| + ProfileMetrics::PROFILE_ENROLLMENT_CLOSE_WELCOME_CARD);
|
| ShowView(BUBBLE_VIEW_MODE_PROFILE_CHOOSER, avatar_menu_.get());
|
| } else if (sender == tutorial_enable_new_profile_management_button_) {
|
| + ProfileMetrics::LogProfileMirrorEnrollment(
|
| + ProfileMetrics::PROFILE_ENROLLMENT_ACCEPT_NEW_PROFILE_MGMT);
|
| profiles::EnableNewProfileManagementPreview();
|
| } else if (sender == remove_account_and_relaunch_button_) {
|
| RemoveAccount();
|
| @@ -596,6 +602,8 @@ void ProfileChooserView::LinkClicked(views::Link* sender, int event_flags) {
|
| ShowView(BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT, avatar_menu_.get());
|
| } else {
|
| DCHECK(sender == tutorial_learn_more_link_);
|
| + ProfileMetrics::LogProfileMirrorEnrollment(
|
| + ProfileMetrics::PROFILE_ENROLLMENT_LAUNCH_LEARN_MORE);
|
| // TODO(guohui): update |learn_more_url| once it is decided.
|
| const GURL lear_more_url("https://support.google.com/chrome/?hl=en#to");
|
| chrome::NavigateParams params(
|
| @@ -672,6 +680,12 @@ views::View* ProfileChooserView::CreateProfileChooserView(
|
| }
|
|
|
| if (tutorial_view) {
|
| + // Be sure not to track the tutorial display on View refresh, and only count
|
| + // the preview-promo view, not the welcome-enabled view.
|
| + if (!tutorial_shown && !switches::IsNewProfileManagement()) {
|
| + ProfileMetrics::LogProfileMirrorEnrollment(
|
| + ProfileMetrics::PROFILE_ENROLLMENT_SHOW_PREVIEW_PROMO);
|
| + }
|
| layout->StartRow(1, 0);
|
| layout->AddView(tutorial_view);
|
| }
|
| @@ -728,7 +742,6 @@ views::View* ProfileChooserView::CreatePreviewEnabledTutorialView(
|
| profile->GetPrefs()->SetInteger(
|
| prefs::kProfileAvatarTutorialShown, show_count + 1);
|
| }
|
| - tutorial_showing_ = true;
|
|
|
| return CreateTutorialView(
|
| l10n_util::GetStringUTF16(IDS_PROFILES_PREVIEW_ENABLED_TUTORIAL_TITLE),
|
| @@ -747,6 +760,8 @@ views::View* ProfileChooserView::CreateTutorialView(
|
| const base::string16& button_text,
|
| views::Link** link,
|
| views::LabelButton** button) {
|
| + tutorial_showing_ = true;
|
| +
|
| views::View* view = new views::View();
|
| view->set_background(views::Background::CreateSolidBackground(
|
| profiles::kAvatarTutorialBackgroundColor));
|
| @@ -762,7 +777,7 @@ views::View* ProfileChooserView::CreateTutorialView(
|
| title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| title_label->SetAutoColorReadabilityEnabled(false);
|
| title_label->SetEnabledColor(SK_ColorWHITE);
|
| - title_label ->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
|
| + title_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
|
| ui::ResourceBundle::MediumFont));
|
| layout->StartRow(1, 0);
|
| layout->AddView(title_label);
|
|
|