Allow severing connection between dispatcher and injector

content/browser/intents/web_intents_dispatcher_impl.cc

Index: content/browser/intents/web_intents_dispatcher_impl.cc
diff --git a/content/browser/intents/web_intents_dispatcher_impl.cc b/content/browser/intents/web_intents_dispatcher_impl.cc
index f58323ef0b4d1d9990fa0e1df32fae9509ef515b..65763893acda4b304df4741310d4a9da89ffb8f6 100644
--- a/content/browser/intents/web_intents_dispatcher_impl.cc
+++ b/content/browser/intents/web_intents_dispatcher_impl.cc
@@ -45,6 +45,13 @@ void WebIntentsDispatcherImpl::DispatchIntent(
   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) {