[Sync] Don't display passphrase notification if user dismissed previous one

chrome/browser/sync/sync_error_notifier_ash.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/sync/sync_error_notifier_ash.h"
 
 #include "ash/common/system/system_notifier.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 80 matching lines @@
     return;
   }
 
   chrome::ShowSettingsSubPageForProfile(profile_, chrome::kSyncSetupSubPage);
 }
 
 }  // namespace
 
 SyncErrorNotifier::SyncErrorNotifier(syncer::SyncErrorController* controller,
                                      Profile* profile)
-    : error_controller_(controller), profile_(profile) {
+    : error_controller_(controller),
+      profile_(profile),
+      notification_displayed_(false) {
   // Create a unique notification ID for this profile.
   notification_id_ =
       kProfileSyncNotificationId + profile_->GetProfileUserName();
 
   error_controller_->AddObserver(this);
   OnErrorChanged();
 }
 
 SyncErrorNotifier::~SyncErrorNotifier() {
   DCHECK(!error_controller_)
       << "SyncErrorNotifier::Shutdown() was not called";
 }
 
 void SyncErrorNotifier::Shutdown() {
   error_controller_->RemoveObserver(this);
   error_controller_ = nullptr;
 }
 
 void SyncErrorNotifier::OnErrorChanged() {
   NotificationUIManager* notification_ui_manager =
       g_browser_process->notification_ui_manager();
 
   // notification_ui_manager() may return null when shutting down.
   if (!notification_ui_manager)
     return;
 
+  if (error_controller_->HasError() == notification_displayed_)
+    return;
+
   if (!error_controller_->HasError()) {
+    notification_displayed_ = false;
     g_browser_process->notification_ui_manager()->CancelById(
         notification_id_, NotificationUIManager::GetProfileID(profile_));
     return;
   }
 
 #if defined(OS_CHROMEOS)
   if (user_manager::UserManager::IsInitialized()) {
     chromeos::UserFlow* user_flow =
         chromeos::ChromeUserManager::Get()->GetCurrentUserFlow();
 
     // Check whether Chrome OS user flow allows launching browser.
     // Example: Supervised user creation flow which handles token invalidation
     // itself and notifications should be suppressed. http://crbug.com/359045
     if (!user_flow->ShouldLaunchBrowser())
       return;
   }
 #endif
 
-  // Keep the existing notification if there is one.
-  if (notification_ui_manager->FindById(
-          notification_id_, NotificationUIManager::GetProfileID(profile_)))
-    return;
+  // Error state just got triggered. There shouldn't be previous notification.
+  // Let's display one.
+  DCHECK(!notification_displayed_ && error_controller_->HasError());
+  DCHECK(notification_ui_manager->FindById(
+             notification_id_, NotificationUIManager::GetProfileID(profile_)) ==
+         nullptr);
 
   // Add an accept button to launch the sync setup settings subpage.
   message_center::RichNotificationData data;
   data.buttons.push_back(message_center::ButtonInfo(
       l10n_util::GetStringUTF16(IDS_SYNC_NOTIFICATION_ACCEPT)));
 
   // Set the delegate for the notification's sync setup button.
   SyncNotificationDelegate* delegate =
       new SyncNotificationDelegate(notification_id_, profile_);
 
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT,
       kProfileSyncNotificationId);
 
   // Set |profile_id| for multi-user notification blocker.
   notifier_id.profile_id =
       multi_user_util::GetAccountIdFromProfile(profile_).GetUserEmail();
 
   // Add a new notification.
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE),
       l10n_util::GetStringUTF16(IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE),
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_NOTIFICATION_ALERT),
       notifier_id,
       base::string16(),  // display_source
       GURL(notification_id_), notification_id_, data, delegate);
   notification_ui_manager->Add(notification, profile_);
+  notification_displayed_ = true;
 }