Make ActiveX CLSIDs and names into overridable variables too. Also make the NPAPI plugin's filename overridable, since that's needed too in order to fully re-brand the NPAPI plugin.

TEST=built on Windows with branding overrides and verified that the product worked in both FF 3.6 and IE7 with similarly modified JavaScript code
BUG=none

Review URL: http://codereview.chromium.org/646071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39630 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 50 insertions, 47 deletions

diff --git a/o3d/plugin/npapi_host_control/win/host_control.rgs b/o3d/plugin/npapi_host_control/win/host_control.rgs
deleted file mode 100644
index 5aa4a7e..0000000
--- a/o3d/plugin/npapi_host_control/win/host_control.rgs
+++ /dev/null
@@ -1,42 +0,0 @@
-HKCU
-{
-  Software
-  {
-    Classes
-    {
-      o3d_host.O3DHostControl.1 = s 'O3DHostControl Class'
-      {
-        CLSID = s '{9666A772-407E-4F90-BC37-982E8160EB2D}'
-        'Insertable'
-      }
-      o3d_host.O3DHostControl = s 'O3DHostControl Class'
-      {
-        CLSID = s '{9666A772-407E-4F90-BC37-982E8160EB2D}'
-        CurVer = s 'o3d_host.O3DHostControl.1'
-      }
-      NoRemove CLSID
-      {
-        ForceRemove {9666A772-407E-4F90-BC37-982E8160EB2D} = s 'O3DHostControl Class'
-        {
-          ProgID = s 'o3d_host.O3DHostControl.1'
-          VersionIndependentProgID = s 'o3d_host.O3DHostControl'
-          ForceRemove 'Programmable'
-          InprocServer32 = s '%MODULE%'
-          {
-            val ThreadingModel = s 'Apartment'
-          }
-          val AppID = s '%APPID%'
-          ForceRemove 'Control'
-          ForceRemove 'Insertable'
-          ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 102'
-          'MiscStatus' = s '0'
-          {
-            '1' = s '%OLEMISC%'
-          }
-          'TypeLib' = s '{D4F6E31C-E952-48FE-9833-6AE308BD79C6}'
-          'Version' = s '1.0'
-        }
-      }
-    }
-  }
-}
diff --git a/o3d/plugin/npapi_host_control/win/host_control.rgs_template b/o3d/plugin/npapi_host_control/win/host_control.rgs_template
new file mode 100644
index 0000000..93d33e0
--- /dev/null
+++ b/o3d/plugin/npapi_host_control/win/host_control.rgs_template
@@ -0,0 +1,42 @@
+HKCU
+{
+  Software
+  {
+    Classes
+    {
+      @@@PluginActiveXHostControlName@@@.O3DHostControl.1 = s 'O3DHostControl Class'
+      {
+        CLSID = s '{@@@PluginActiveXHostControlClsid@@@}'
+        'Insertable'
+      }
+      @@@PluginActiveXHostControlName@@@.O3DHostControl = s 'O3DHostControl Class'
+      {
+        CLSID = s '{@@@PluginActiveXHostControlClsid@@@}'
+        CurVer = s '@@@PluginActiveXHostControlName@@@.O3DHostControl.1'
+      }
+      NoRemove CLSID
+      {
+        ForceRemove {@@@PluginActiveXHostControlClsid@@@} = s 'O3DHostControl Class'
+        {
+          ProgID = s '@@@PluginActiveXHostControlName@@@.O3DHostControl.1'
+          VersionIndependentProgID = s '@@@PluginActiveXHostControlName@@@.O3DHostControl'
+          ForceRemove 'Programmable'
+          InprocServer32 = s '%MODULE%'
+          {
+            val ThreadingModel = s 'Apartment'
+          }
+          val AppID = s '%APPID%'
+          ForceRemove 'Control'
+          ForceRemove 'Insertable'
+          ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 102'
+          'MiscStatus' = s '0'
+          {
+            '1' = s '%OLEMISC%'
+          }
+          'TypeLib' = s '{@@@PluginActiveXTypeLibClsid@@@}'
+          'Version' = s '1.0'
+        }
+      }
+    }
+  }
+}
diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc
index 7de9d67..afc97d1 100644
--- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc
+++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc
@@ -44,9 +44,12 @@
 
 namespace {
 
-const wchar_t kPluginName[] = L"npo3dautoplugin.dll";
+#define WIDE(s) WIDE2(s)
+#define WIDE2(s) L##s
+
+const wchar_t kPluginName[] = WIDE(O3D_PLUGIN_NPAPI_FILENAME) L".dll";
 const wchar_t kAppDataPluginLocation[] =
-    L"Mozilla\\plugins\\npo3dautoplugin.dll";
+    L"Mozilla\\plugins\\" WIDE(O3D_PLUGIN_NPAPI_FILENAME) L".dll";
 
 // Returns the path to the O3D plug-in located in the current user's
 // Application Data directory.  Returns NULL on failure.
@@ -83,7 +86,7 @@ const wchar_t* GetMozillaPluginPath() {
 }
 
 const wchar_t kProgramFilesPluginLocation[] =
-    L"Mozilla Firefox\\plugins\\npo3dautoplugin.dll";
+    L"Mozilla Firefox\\plugins\\" WIDE(O3D_PLUGIN_NPAPI_FILENAME) L".dll";
 
 // Returns the path to the O3D plug-in located in the Program
 // Files directory.  Returns NULL on failure.
diff --git a/o3d/plugin/npapi_host_control/win/npapi_host_control.idl b/o3d/plugin/npapi_host_control/win/npapi_host_control.idl_template
index 14822c8..207c15a 100644
--- a/o3d/plugin/npapi_host_control/win/npapi_host_control.idl
+++ b/o3d/plugin/npapi_host_control/win/npapi_host_control.idl_template
@@ -73,7 +73,7 @@ interface INPObjectProxy : IDispatchEx {
 };
 
 [
-  uuid(D4F6E31C-E952-48FE-9833-6AE308BD79C6),
+  uuid(@@@PluginActiveXTypeLibClsid@@@),
   version(1.0),
   helpstring("npapi_host2 1.0 Type Library")
 ]
@@ -81,7 +81,7 @@ library npapi_host_controlLib
 {
   importlib("stdole2.tlb");
   [
-    uuid(9666A772-407E-4F90-BC37-982E8160EB2D),
+    uuid(@@@PluginActiveXHostControlClsid@@@),
     //control,
     helpstring("HostControl Class")
   ]