diff options
Diffstat (limited to 'ceee/ie/plugin/toolband')
| -rw-r--r-- | ceee/ie/plugin/toolband/resource.h | 9 | ||||
| -rw-r--r-- | ceee/ie/plugin/toolband/tool_band.h | 7 | ||||
| -rw-r--r-- | ceee/ie/plugin/toolband/tool_band.rgs | 4 | ||||
| -rw-r--r-- | ceee/ie/plugin/toolband/toolband.gyp | 1 | ||||
| -rw-r--r-- | ceee/ie/plugin/toolband/toolband.rc | 6 |
5 files changed, 18 insertions, 9 deletions
diff --git a/ceee/ie/plugin/toolband/resource.h b/ceee/ie/plugin/toolband/resource.h index 1d27001..b3856e5 100644 --- a/ceee/ie/plugin/toolband/resource.h +++ b/ceee/ie/plugin/toolband/resource.h @@ -17,17 +17,20 @@ #define IDR_TOOL_BAND 103 #define IDR_GREASEMONKEY_API_JS 105 #define IDR_EXECUTOR 106 -#define IDR_EXECUTOR_CREATOR 107 #define IDR_TOOLBAND_PROXY 108 +#define IDS_CEEE_NAME 109 +#define IDS_CEEE_EXECUTOR_CREATOR_NAME 110 +#define IDS_CEEE_EXECUTOR_NAME 111 + // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 +#define _APS_NEXT_RESOURCE_VALUE 112 #define _APS_NEXT_COMMAND_VALUE 32768 #define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 109 +#define _APS_NEXT_SYMED_VALUE 112 #endif #endif diff --git a/ceee/ie/plugin/toolband/tool_band.h b/ceee/ie/plugin/toolband/tool_band.h index 08ae691..e48dfd5 100644 --- a/ceee/ie/plugin/toolband/tool_band.h +++ b/ceee/ie/plugin/toolband/tool_band.h @@ -20,6 +20,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" +#include "base/win/rgs_helper.h" #include "ceee/ie/plugin/toolband/resource.h" #include "chrome_tab.h" // NOLINT @@ -53,7 +54,11 @@ class ATL_NO_VTABLE ToolBand : public CComObjectRootEx<CComSingleThreadModel>, ToolBand(); ~ToolBand(); - DECLARE_REGISTRY_RESOURCEID(IDR_TOOL_BAND) + DECLARE_REGISTRY_RESOURCEID_EX(IDR_TOOL_BAND) + BEGIN_REGISTRY_MAP(ToolBand) + REGMAP_UUID("CLSID", CLSID_ToolBand) + REGMAP_RESOURCE("NAME", IDS_CEEE_NAME) + END_REGISTRY_MAP() BEGIN_COM_MAP(ToolBand) COM_INTERFACE_ENTRY(IDeskBand) diff --git a/ceee/ie/plugin/toolband/tool_band.rgs b/ceee/ie/plugin/toolband/tool_band.rgs index 0a7ec34..e9ff6ba 100644 --- a/ceee/ie/plugin/toolband/tool_band.rgs +++ b/ceee/ie/plugin/toolband/tool_band.rgs @@ -1,6 +1,6 @@ HKCR { NoRemove CLSID { - ForceRemove '{2F1A2D6B-55F6-4B63-8C37-F698D28FDC2B}' = s 'Google Chrome Extensions Execution Environment' { + ForceRemove '%CLSID%' = s '%NAME%' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } @@ -12,7 +12,7 @@ HKLM { NoRemove Microsoft { NoRemove 'Internet Explorer' { NoRemove Toolbar { - val '{2F1A2D6B-55F6-4B63-8C37-F698D28FDC2B}' = s 'Google Chrome Extensions Execution Environment' + val '%CLSID%' = s '%NAME%' } } } diff --git a/ceee/ie/plugin/toolband/toolband.gyp b/ceee/ie/plugin/toolband/toolband.gyp index 63686f1..16eb0e5 100644 --- a/ceee/ie/plugin/toolband/toolband.gyp +++ b/ceee/ie/plugin/toolband/toolband.gyp @@ -63,7 +63,6 @@ 'toolband_module.cc', '../bho/browser_helper_object.rgs', '../executor.rgs', - '../executor_creator.rgs', '../scripting/content_script_manager.rc', ], 'libraries': [ diff --git a/ceee/ie/plugin/toolband/toolband.rc b/ceee/ie/plugin/toolband/toolband.rc index d31f5b2..9a2609a 100644 --- a/ceee/ie/plugin/toolband/toolband.rc +++ b/ceee/ie/plugin/toolband/toolband.rc @@ -80,7 +80,6 @@ END IDR_BROWSERHELPEROBJECT REGISTRY "ceee\\ie\\plugin\\bho\\browser_helper_object.rgs" IDR_EXECUTOR REGISTRY "ceee\\ie\\plugin\\bho\\executor.rgs" -IDR_EXECUTOR_CREATOR REGISTRY "ceee\\ie\\plugin\\bho\\executor_creator.rgs" IDR_TOOL_BAND REGISTRY "tool_band.rgs" IDR_TOOLBAND_PROXY REGISTRY "toolband_proxy.rgs" @@ -98,7 +97,10 @@ IDR_GREASEMONKEY_API_JS BINDATA "chrome\\renderer\\resources\\gr STRINGTABLE BEGIN - IDS_PROJNAME "IE" + IDS_PROJNAME "IE" + IDS_CEEE_NAME "Google Chrome Extensions Execution Environment" + IDS_CEEE_EXECUTOR_CREATOR_NAME "Google CEEE Executor Creator" + IDS_CEEE_EXECUTOR_NAME "Google CEEE Executor" END #endif // English (U.S.) resources |