Reland r57788 - Expose Extension Bindings to Component Applications

chrome/browser/extensions/extension_function_dispatcher.h

 // Copyright (c) 2010 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_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 96 matching lines @@
   Browser* GetCurrentBrowser(bool include_incognito);
 
   // Handle a malformed message.  Possibly the result of an attack, so kill
   // the renderer.
   void HandleBadMessage(ExtensionFunction* api);
 
   // Gets the URL for the view we're displaying.
   const GURL& url() { return url_; }
 
   // Gets the ID for this extension.
-  const std::string extension_id() { return url_.host(); }
+  const std::string extension_id() { return extension_id_; }
 
   // The profile that this dispatcher is associated with.
   Profile* profile();
 
   // The RenderViewHost this dispatcher is associated with.
   RenderViewHost* render_view_host() { return render_view_host_; }
 
  private:
   ExtensionFunctionDispatcher(RenderViewHost* render_view_host,
                               Delegate* delegate,
                               Extension* extension,
                               const GURL& url);
 
   // We need to keep a pointer to the profile because we use it in the dtor
   // in sending EXTENSION_FUNCTION_DISPATCHER_DESTROYED, but by that point
   // the render_view_host_ has been deleted.
   Profile* profile_;
 
   RenderViewHost* render_view_host_;
 
   Delegate* delegate_;
 
   GURL url_;
 
+  std::string extension_id_;
+
   scoped_refptr<Peer> peer_;
 
   // AutomationExtensionFunction requires access to the RenderViewHost
   // associated with us.  We make it a friend rather than exposing the
   // RenderViewHost as a public method as we wouldn't want everyone to
   // start assuming a 1:1 relationship between us and RenderViewHost,
   // whereas AutomationExtensionFunction is by necessity "tight" with us.
   friend class AutomationExtensionFunction;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_