diff options
| author | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 23:19:58 +0000 |
|---|---|---|
| committer | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 23:19:58 +0000 |
| commit | b34e68807deb5be76409624973874ba7269755b6 (patch) | |
| tree | 3f15ef9958395576604a11684b83ec83374a90ce /ceee/ie/broker | |
| parent | b13f9c409db484d0e5cf37e22071d61a41cfd641 (diff) | |
| download | chromium_src-b34e68807deb5be76409624973874ba7269755b6.zip chromium_src-b34e68807deb5be76409624973874ba7269755b6.tar.gz chromium_src-b34e68807deb5be76409624973874ba7269755b6.tar.bz2 | |
Stop using Hard Coded copies of GUID strings in RGS files.
BUG=0
TEST=Make sure everything works after unregistration and re-registration.
Review URL: http://codereview.chromium.org/5113005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie/broker')
| -rw-r--r-- | ceee/ie/broker/broker.h | 8 | ||||
| -rw-r--r-- | ceee/ie/broker/broker.rgs | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ceee/ie/broker/broker.h b/ceee/ie/broker/broker.h index 8132e8a..163757a 100644 --- a/ceee/ie/broker/broker.h +++ b/ceee/ie/broker/broker.h @@ -11,6 +11,7 @@ #include <atlbase.h> #include <atlcom.h> +#include "base/win/rgs_helper.h" #include "ceee/ie/broker/resource.h" #include "broker_lib.h" // NOLINT @@ -30,7 +31,12 @@ class ATL_NO_VTABLE CeeeBroker public ICeeeBrokerRegistrar, public IExternalConnectionImpl<CeeeBroker> { public: - DECLARE_REGISTRY_RESOURCEID(IDR_BROKER) + DECLARE_REGISTRY_RESOURCEID_EX(IDR_BROKER) + BEGIN_REGISTRY_MAP(CeeeBroker) + REGMAP_UUID("CLSID", CLSID_CeeeBroker) + REGMAP_UUID("LIBID", LIBID_CeeeBrokerLib) + REGMAP_ENTRY("NAME", "Google CEEE Broker") + END_REGISTRY_MAP() DECLARE_NOT_AGGREGATABLE(CeeeBroker) BEGIN_COM_MAP(CeeeBroker) diff --git a/ceee/ie/broker/broker.rgs b/ceee/ie/broker/broker.rgs index 65b012b..50ee07d 100644 --- a/ceee/ie/broker/broker.rgs +++ b/ceee/ie/broker/broker.rgs @@ -1,9 +1,9 @@ HKCR { NoRemove CLSID { - ForceRemove {6D88A70D-2218-4466-BBD6-87AB563811A2} = s 'Google CEEE Broker' { + ForceRemove '%CLSID%' = s '%NAME%' { ForceRemove 'Programmable' LocalServer32 = s '%MODULE%' - 'TypeLib' = s '{45B783D0-8040-49a6-A719-84E320AAB3C5}' + 'TypeLib' = s '%LIBID%' } } } |