[sync] Display an error when sync settings aren't confirmed

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/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
@@ skipping 558 matching lines @@
   if (oauth2_token_service)
     oauth2_token_service->RemoveObserver(this);
 }
 
 void ProfileChooserView::ResetView() {
   open_other_profile_indexes_map_.clear();
   delete_account_button_map_.clear();
   reauth_account_button_map_.clear();
   sync_error_signin_button_ = nullptr;
   sync_error_passphrase_button_ = nullptr;
+  sync_error_settings_unconfirmed_button_ = nullptr;
   sync_error_upgrade_button_ = nullptr;
   sync_error_signin_again_button_ = nullptr;
   sync_error_signout_button_ = nullptr;
   manage_accounts_link_ = nullptr;
   manage_accounts_button_ = nullptr;
   signin_current_profile_button_ = nullptr;
   current_profile_card_ = nullptr;
   first_profile_button_ = nullptr;
   guest_profile_button_ = nullptr;
   users_button_ = nullptr;
@@ skipping 209 matching lines @@
     DCHECK(ShouldShowGoIncognito());
     chrome::NewIncognitoWindow(browser_);
     PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_GO_INCOGNITO);
   } else if (sender == lock_button_) {
     profiles::LockProfile(browser_->profile());
     PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_LOCK);
   } else if (sender == close_all_windows_button_) {
     profiles::CloseProfileWindows(browser_->profile());
   } else if (sender == sync_error_signin_button_) {
     ShowViewFromMode(profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH);
-  } else if (sender == sync_error_passphrase_button_) {
+  } else if (sender == sync_error_passphrase_button_ ||
+             sender == sync_error_settings_unconfirmed_button_) {
     chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
   } else if (sender == sync_error_upgrade_button_) {
     chrome::OpenUpdateChromeDialog(browser_);
   } else if (sender == sync_error_signin_again_button_) {
     if (ProfileSyncServiceFactory::GetForProfile(browser_->profile()))
       browser_sync::ProfileSyncService::SyncEvent(
           browser_sync::ProfileSyncService::STOP_FROM_OPTIONS);
     SigninManagerFactory::GetForProfile(browser_->profile())
         ->SignOut(signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS,
                   signin_metrics::SignoutDelete::IGNORE_METRIC);
@@ skipping 160 matching lines @@
   if (option_buttons_view) {
     layout->StartRow(0, 0);
     layout->AddView(option_buttons_view);
   }
   return view;
 }
 
 views::View* ProfileChooserView::CreateSyncErrorViewIfNeeded() {
   int content_string_id, button_string_id;
   views::LabelButton** button_out = nullptr;
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(browser_->profile());
   sync_ui_util::AvatarSyncErrorType error =
       sync_ui_util::GetMessagesForAvatarSyncError(
-          browser_->profile(), &content_string_id, &button_string_id);
+          browser_->profile(), *signin_manager, &content_string_id,
+          &button_string_id);
   switch (error) {
     case sync_ui_util::MANAGED_USER_UNRECOVERABLE_ERROR:
       button_out = &sync_error_signout_button_;
       break;
     case sync_ui_util::UNRECOVERABLE_ERROR:
       button_out = &sync_error_signin_again_button_;
       break;
     case sync_ui_util::SUPERVISED_USER_AUTH_ERROR:
       button_out = nullptr;
       break;
     case sync_ui_util::AUTH_ERROR:
       button_out = &sync_error_signin_button_;
       break;
     case sync_ui_util::UPGRADE_CLIENT_ERROR:
       button_out = &sync_error_upgrade_button_;
       break;
     case sync_ui_util::PASSPHRASE_ERROR:
       button_out = &sync_error_passphrase_button_;
       break;
+    case sync_ui_util::SETTINGS_UNCONFIRMED_ERROR:
+      button_out = &sync_error_settings_unconfirmed_button_;
+      break;
     case sync_ui_util::NO_SYNC_ERROR:
       return nullptr;
     default:
       NOTREACHED();
   }
 
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
 
   // Sets an overall horizontal layout.
   views::View* view = new views::View();
@@ skipping 597 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;
 }