Allow severing connection between dispatcher and injector

content/browser/intents/intent_injector.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_
 #define CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/web_intent_reply_data.h"
 
 namespace content {
 class WebIntentsDispatcher;
 }
 
@@ skipping 27 matching lines @@
   void SourceWebContentsDestroyed(content::WebContents* contents);
 
   // Sets the intent data to be injected. Call after the user has selected a
   // service to pass the intent data to that service. |intents_dispatcher| is a
   // sender to use to communicate to the source contents. The caller must
   // ensure that SourceWebContentsDestroyed is called when this object becomes
   // unusable. |intent| is the intent data from the source.
   void SetIntent(content::WebIntentsDispatcher* intents_dispatcher,
                  const webkit_glue::WebIntentData& intent);
 
+  // Abandon this injector. Used when re-delivering an intent to a different
+  // service provider, i.e. when abandoning an inline disposition and picking
+  // a new provider.

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

Document that this self-deletes.

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

Done.

+  void Abandon();
+
  private:
+  FRIEND_TEST_ALL_PREFIXES(IntentInjectorTest, AbandonDeletes);
+
   // Handles receiving a reply from the intent delivery page.
   void OnReply(webkit_glue::WebIntentReplyType reply_type,
                const string16& data);
 
   // Gets notification that someone else has replied to the intent call.
   void OnSendReturnMessage(webkit_glue::WebIntentReplyType reply_type);
 
   // Source intent data provided by caller.
   scoped_ptr<webkit_glue::WebIntentData> source_intent_;
 
   // Weak pointer to the message forwarder to the contents invoking the intent.
   content::WebIntentsDispatcher* intents_dispatcher_;
 
   // Remember the initial delivery url for origin restriction.
   GURL initial_url_;
 
+  // The injector is used as a callback target by the intent dispatcher,
+  // but is not guaranteed to outlive it. Use weak pointers to handle lifetime

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

"The injector may be Abandon()ed and deleted before the dispatcher. Use weak
pointers to ensure the notification callback remains valid."

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

Done.

+  // issues.
+  base::WeakPtrFactory<IntentInjector> weak_factory_;

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

weak_ptr_factory_

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

weak_factory_ seems to be the preferred naming, actually. (1000 vs. 729
weak_ptr_factory_)
On 2012/04/25 14:26:52, Greg Billock wrote:

+
   DISALLOW_COPY_AND_ASSIGN(IntentInjector);
 };
 
 #endif  // CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_