Allow severing connection between dispatcher and injector

content/browser/intents/web_intents_dispatcher_impl.cc

 // Copyright (c) 2012 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 "content/browser/intents/web_intents_dispatcher_impl.h"
 
 #include "content/browser/intents/intent_injector.h"
 #include "content/browser/intents/internal_web_intents_dispatcher.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/intents_messages.h"
@@ skipping 27 matching lines @@
   return intent_;
 }
 
 void WebIntentsDispatcherImpl::DispatchIntent(
     WebContents* destination_contents) {
   DCHECK(!intent_injector_);
   intent_injector_ = new IntentInjector(destination_contents);
   intent_injector_->SetIntent(this, intent_);
 }
 
+void WebIntentsDispatcherImpl::CancelDispatch() {
+  if (intent_injector_) {
+    intent_injector_->Abandon();

[Greg Billock, 2012/04/25 14:26:52]

An alternate way to do this is to clear reply_notifiers_ and delete
intent_injector_. We'd need to re-register the controller and anyone else
listening, then... You think this is neater? It's definitely more
self-contained.

[groby-ooo-7-16, 2012/04/25 16:40:10]

The re-registering would happen in all sorts of different classes, though. I
think this is cleaner and expresses the intent better - abandon our current
attempt, so we can restart a new one.

On 2012/04/25 14:26:52, Greg Billock wrote:

+    intent_injector_ = NULL;
+  }
+}
+
 void WebIntentsDispatcherImpl::SendReplyMessage(
     webkit_glue::WebIntentReplyType reply_type,
     const string16& data) {
   intent_injector_ = NULL;
 
   if (web_contents()) {
     Send(new IntentsMsg_WebIntentReply(
         routing_id(), reply_type, data, intent_id_));
   }
 
   for (size_t i = 0; i < reply_notifiers_.size(); ++i) {
     if (!reply_notifiers_[i].is_null())
       reply_notifiers_[i].Run(reply_type);
   }
 
   delete this;
 }
 
 void WebIntentsDispatcherImpl::RegisterReplyNotification(
     const content::WebIntentsDispatcher::ReplyNotification& closure) {
   reply_notifiers_.push_back(closure);
 }
 
 void WebIntentsDispatcherImpl::WebContentsDestroyed(WebContents* contents) {
   if (intent_injector_)
     intent_injector_->SourceWebContentsDestroyed(contents);
 
   intent_injector_ = NULL;
 }