Add right-click user switching tutorial bubble.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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/views/profiles/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 473 matching lines @@
     profiles::TutorialMode tutorial_mode,
     const signin::ManageAccountsParams& manage_accounts_params,
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow,
     views::BubbleBorder::BubbleAlignment border_alignment,
     Browser* browser) {
   // Don't start creating the view if it would be an empty fast user switcher.
   // It has to happen here to prevent the view system from creating an empty
   // container.
   if (view_mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER &&
-      profiles::HasProfileSwitchTargets(browser->profile())) {
+      !profiles::HasProfileSwitchTargets(browser->profile())) {
     return;
   }
 
   if (IsShowing()) {
     if (tutorial_mode != profiles::TUTORIAL_MODE_NONE) {
       profile_bubble_->tutorial_mode_ = tutorial_mode;
       profile_bubble_->ShowView(view_mode, profile_bubble_->avatar_menu_.get());
     }
     return;
   }
@@ skipping 401 matching lines @@
   views::View* current_profile_view = NULL;
   views::View* current_profile_accounts = NULL;
   views::View* option_buttons_view = NULL;
   for (size_t i = 0; i < avatar_menu->GetNumberOfItems(); ++i) {
     const AvatarMenu::Item& item = avatar_menu->GetItemAt(i);
     if (item.active) {
       option_buttons_view = CreateOptionsView(
           item.signed_in && profiles::IsLockAvailable(browser_->profile()));
       current_profile_view = CreateCurrentProfileView(item, false);
       if (IsProfileChooser(view_mode_)) {
-        switch (tutorial_mode_) {
-          case profiles::TUTORIAL_MODE_NONE:
-          case profiles::TUTORIAL_MODE_WELCOME_UPGRADE:
-            tutorial_view = CreateWelcomeUpgradeTutorialViewIfNeeded(
-                tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE,
-                item);
-            break;
-          case profiles::TUTORIAL_MODE_CONFIRM_SIGNIN:
-            tutorial_view = CreateSigninConfirmationView();
-            break;
-          case profiles::TUTORIAL_MODE_SHOW_ERROR:
-            tutorial_view = CreateSigninErrorView();
-            break;
-        }
+        tutorial_view = CreateTutorialViewIfNeeded(item);
       } else {
         current_profile_accounts = CreateCurrentProfileAccountsView(item);
       }
     } else {
       other_profiles.push_back(i);
     }
   }
 
   if (tutorial_view) {
     // TODO(mlerman): update UMA stats for the new tutorial.
@@ skipping 56 matching lines @@
 
   layout->StartRow(1, 0);
   layout->AddView(CreateOtherProfilesView(other_profiles));
 }
 
 views::View* ProfileChooserView::CreateProfileChooserView(
     AvatarMenu* avatar_menu) {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateSingleColumnLayout(view, kFixedMenuWidth);
 
-  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER)
+  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER) {
     PopulateMinimalProfileChooserView(layout, avatar_menu);
-  else
+    // The user is using right-click switching, no need to tell them about it.
+    PrefService* local_state = g_browser_process->local_state();
+    local_state->SetBoolean(
+        prefs::kProfileAvatarRightClickTutorialDismissed, true);
+  } else {
     PopulateCompleteProfileChooserView(layout, avatar_menu);
+  }
 
   return view;
 }
 
 void ProfileChooserView::DismissTutorial() {
   // Never shows the upgrade tutorial again if manually closed.
   if (tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE) {
     browser_->profile()->GetPrefs()->SetInteger(
         prefs::kProfileAvatarTutorialShown,
         signin_ui_util::kUpgradeWelcomeTutorialShowMax + 1);
   }
 
+  if (tutorial_mode_ == profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING) {
+    PrefService* local_state = g_browser_process->local_state();
+    local_state->SetBoolean(
+        prefs::kProfileAvatarRightClickTutorialDismissed, true);
+  }
+
   tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
   ShowView(profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER, avatar_menu_.get());
 }
 
+views::View* ProfileChooserView::CreateTutorialViewIfNeeded(
+    const AvatarMenu::Item& item) {
+  if (tutorial_mode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN)
+    return CreateSigninConfirmationView();
+
+  if (tutorial_mode_ == profiles::TUTORIAL_MODE_SHOW_ERROR)
+    return CreateSigninErrorView();
+
+  if (ShouldShowWelcomeUpgradeTutorial()) {
+    if (tutorial_mode_ != profiles::TUTORIAL_MODE_WELCOME_UPGRADE) {
+      Profile* profile = browser_->profile();
+      const int show_count = profile->GetPrefs()->GetInteger(
+          prefs::kProfileAvatarTutorialShown);
+      profile->GetPrefs()->SetInteger(
+          prefs::kProfileAvatarTutorialShown, show_count + 1);
+    }
+
+    return CreateWelcomeUpgradeTutorialView(item);
+  }
+
+  if (ShouldShowRightClickTutorialView())
+    return CreateRightClickTutorialView();
+
+  return nullptr;
+}
+
 views::View* ProfileChooserView::CreateTutorialView(
     profiles::TutorialMode tutorial_mode,
     const base::string16& title_text,
     const base::string16& content_text,
     const base::string16& link_text,
     const base::string16& button_text,
     bool stack_button,
     views::Link** link,
     views::LabelButton** button,
     views::ImageButton** close_button) {
@@ skipping 529 matching lines @@
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   }
 
   TitleCard* title_card = new TitleCard(
       l10n_util::GetStringUTF16(IDS_PROFILES_ACCOUNT_REMOVAL_TITLE),
       this, &account_removal_cancel_button_);
   return TitleCard::AddPaddedTitleCard(view, title_card,
       kFixedAccountRemovalViewWidth);
 }
 
-views::View* ProfileChooserView::CreateWelcomeUpgradeTutorialViewIfNeeded(
-    bool tutorial_shown, const AvatarMenu::Item& avatar_item) {
+bool ProfileChooserView::ShouldShowWelcomeUpgradeTutorial() {

[Mike Lerman, 2015/05/14 20:29:43]

You can remove these method definitions from the header file. (this function,
and below, from the View and the Controller)

[anthonyvd, 2015/05/15 13:26:56]

Done.

   Profile* profile = browser_->profile();
 
   const int show_count = profile->GetPrefs()->GetInteger(
       prefs::kProfileAvatarTutorialShown);
   // Do not show the tutorial if user has dismissed it.
   if (show_count > signin_ui_util::kUpgradeWelcomeTutorialShowMax)
-    return NULL;
+    return false;
 
-  if (!tutorial_shown) {
-    if (show_count == signin_ui_util::kUpgradeWelcomeTutorialShowMax)
-      return NULL;
-    profile->GetPrefs()->SetInteger(
-        prefs::kProfileAvatarTutorialShown, show_count + 1);
-  }
+  return tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE ||
+         show_count != signin_ui_util::kUpgradeWelcomeTutorialShowMax;
+}
+
+bool ProfileChooserView::ShouldShowRightClickTutorialView() {
+  PrefService* local_state = g_browser_process->local_state();
+  const bool dismissed = local_state->GetBoolean(
+      prefs::kProfileAvatarRightClickTutorialDismissed);
+
+  // Don't show the tutorial if it's already been dismissed or if right-clicking
+  // wouldn't show any targets.
+  return !dismissed && profiles::HasProfileSwitchTargets(browser_->profile());
+}
+
+views::View* ProfileChooserView::CreateWelcomeUpgradeTutorialView(
+    const AvatarMenu::Item& avatar_item) {
   ProfileMetrics::LogProfileNewAvatarMenuUpgrade(
       ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW);
 
   // For local profiles, the "Not you" link doesn't make sense.
   base::string16 link_message = avatar_item.signed_in ?
       l10n_util::GetStringFUTF16(IDS_PROFILES_NOT_YOU, avatar_item.name) :
       base::string16();
 
   return CreateTutorialView(
       profiles::TUTORIAL_MODE_WELCOME_UPGRADE,
@@ skipping 35 matching lines @@
       l10n_util::GetStringUTF16(IDS_PROFILES_ERROR_TUTORIAL_TITLE),
       last_login_result,
       l10n_util::GetStringUTF16(IDS_PROFILES_PROFILE_TUTORIAL_LEARN_MORE),
       base::string16(),
       false /* stack_button */,
       &tutorial_learn_more_link_,
       NULL,
       &tutorial_close_button_);
 }
 
+views::View* ProfileChooserView::CreateRightClickTutorialView() {
+    return CreateTutorialView(
+      profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING,
+      l10n_util::GetStringUTF16(IDS_PROFILES_RIGHT_CLICK_TUTORIAL_TITLE),
+      l10n_util::GetStringUTF16(IDS_PROFILES_RIGHT_CLICK_TUTORIAL_CONTENT_TEXT),
+      base::string16(),
+      l10n_util::GetStringUTF16(IDS_PROFILES_TUTORIAL_OK_BUTTON),
+      false,
+      nullptr,
+      &tutorial_sync_settings_ok_button_,
+      nullptr);
+}
+
 views::View* ProfileChooserView::CreateSwitchUserView() {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateSingleColumnLayout(
       view, kFixedSwitchUserViewWidth);
   views::ColumnSet* columns = layout->AddColumnSet(1);
   columns->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
   int label_width =
       kFixedSwitchUserViewWidth - 2 * views::kButtonHEdgeMarginNew;
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                      views::GridLayout::FIXED, label_width, label_width);
@@ skipping 48 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }