Notify all active login prompts when one login prompt is submitted. This allo...

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2009 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/automation/automation_provider_observers.h"
 
 #include "base/basictypes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 119 matching lines @@
     controller_(controller),
     navigations_remaining_(number_of_navigations),
     navigation_started_(false) {
   DCHECK_LT(0, navigations_remaining_);
   Source<NavigationController> source(controller_);
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED, source);
   registrar_.Add(this, NotificationType::LOAD_START, source);
   registrar_.Add(this, NotificationType::LOAD_STOP, source);
   registrar_.Add(this, NotificationType::AUTH_NEEDED, source);
   registrar_.Add(this, NotificationType::AUTH_SUPPLIED, source);
+  registrar_.Add(this, NotificationType::AUTH_CANCELLED, source);
 
   if (include_current_navigation && controller->tab_contents()->is_loading())
     navigation_started_ = true;
 }
 
 NavigationNotificationObserver::~NavigationNotificationObserver() {
   if (reply_message_) {
     // This means we did not receive a notification for this navigation.
     // Send over a failed navigation status back to the caller to ensure that
     // the caller does not hang waiting for the response.
@@ skipping 18 matching lines @@
   // we need the NotificationType::LOAD_START.
   if (type == NotificationType::NAV_ENTRY_COMMITTED ||
       type == NotificationType::LOAD_START) {
     navigation_started_ = true;
   } else if (type == NotificationType::LOAD_STOP) {
     if (navigation_started_) {
       navigation_started_ = false;
       if (--navigations_remaining_ == 0)
         ConditionMet(AUTOMATION_MSG_NAVIGATION_SUCCESS);
     }
-  } else if (type == NotificationType::AUTH_SUPPLIED) {
+  } else if (type == NotificationType::AUTH_SUPPLIED ||
+             type == NotificationType::AUTH_CANCELLED) {
     // The LoginHandler for this tab is no longer valid.
     automation_->RemoveLoginHandler(controller_);
 
     // Treat this as if navigation started again, since load start/stop don't
     // occur while authentication is ongoing.
     navigation_started_ = true;
   } else if (type == NotificationType::AUTH_NEEDED) {
     // Remember the login handler that wants authentication.
     // We do this in all cases (not just when navigation_started_ == true) so
     // tests can still wait for auth dialogs outside of navigation.
@@ skipping 569 matching lines @@
 AutomationProviderBookmarkModelObserver::~AutomationProviderBookmarkModelObserver() {
   model_->RemoveObserver(this);
 }
 
 void AutomationProviderBookmarkModelObserver::ReplyAndDelete(bool success) {
   AutomationMsg_WaitForBookmarkModelToLoad::WriteReplyParams(
       reply_message_, success);
   automation_provider_->Send(reply_message_);
   delete this;
 }