Add a method to the controller to close the picker/service tab when a return value is passed.

chrome/browser/ui/intents/web_intent_picker_controller.h

 // Copyright (c) 2011 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 CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/glue/web_intent_data.h"
 
 class Browser;
 class FaviconService;
 class GURL;
 class SkBitmap;
+class TabContents;
 class TabContentsWrapper;
 class WebDataService;
 class WebIntentPicker;
 class WebIntentPickerFactory;
 
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
 // Controls the creation of the WebIntentPicker UI and forwards the user's
@@ skipping 26 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // WebIntentPickerDelegate implementation.
   virtual void OnServiceChosen(size_t index) OVERRIDE;
   virtual void OnCancelled() OVERRIDE;
   virtual void OnClosing() OVERRIDE;
 
  private:
+  // Gets a notification when the return message is sent to the source tab,
+  // so we can close the picker dialog or service tab.
+  void OnSendReturnMessage();
+
   friend class WebIntentPickerControllerTest;
   friend class WebIntentPickerControllerBrowserTest;
+  friend class InvokingTabObserver;
   class WebIntentDataFetcher;
   class FaviconFetcher;
 
   int pending_async_count() const { return pending_async_count_; }
 
   // Called from the WebIntentDataFetcher when intent data is available.
   void OnWebIntentDataAvailable(
       const std::vector<webkit_glue::WebIntentServiceData>& services);
 
   // Called from the FaviconDataFetcher when a favicon is available.
@@ skipping 36 matching lines @@
   // The routing id of the renderer which launched the intent. Should be the
   // renderer associated with the TabContents which owns this object.
   int routing_id_;
 
   // The intent data from the client.
   webkit_glue::WebIntentData intent_;
 
   // The intent ID assigned to this intent by the renderer.
   int intent_id_;
 
+  // Weak pointer to the tab servicing the intent. Remembered in order to
+  // close it when a reply is sent.
+  TabContents* service_tab_;
+
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_