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 404 matching lines @@
   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:
+          case profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING:
             tutorial_view = CreateWelcomeUpgradeTutorialViewIfNeeded(
                 tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE,
                 item);
+            if (!tutorial_view)

[Mike Lerman, 2015/05/05 01:31:45]

I understand what you're doing here, but the control flow doesn't seem obvious. 

As one example, this would be much more readable if there were a function that
determined which tutorial to display, and then a function that displayed the
tutorial. There may be other flows that work, too.

[anthonyvd, 2015/05/05 16:19:17]

Very good point, here's a small refactor :) Let me know what you think!

[Mike Lerman, 2015/05/05 17:18:09]

I love it! Thanks!

+              tutorial_view = CreateRightClickTutorialViewIfNeeded();
             break;
           case profiles::TUTORIAL_MODE_CONFIRM_SIGNIN:
             tutorial_view = CreateSigninConfirmationView();
             break;
           case profiles::TUTORIAL_MODE_SHOW_ERROR:
             tutorial_view = CreateSigninErrorView();
             break;
         }
       } else {
         current_profile_accounts = CreateCurrentProfileAccountsView(item);
@@ skipping 64 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.
+    profiles::SetFastUserSwitchingTutorialDismissedState(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) {
+    profiles::SetFastUserSwitchingTutorialDismissedState(true);
+  }
+
   tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
   ShowView(profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER, avatar_menu_.get());
 }
 
 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,
@@ skipping 604 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::CreateRightClickTutorialViewIfNeeded() {
+  const bool dismissed = profiles::GetFastUserSwitchingTutorialDismissedState();
+
+  // Don't show the tutorial if it's already been dismissed for this profile or
+  // if right-clicking wouldn't show any targets.
+  if (dismissed || !profiles::HasProfileSwitchTargets(browser_->profile()))
+    return nullptr;
+
+  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;
 }