diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 21:58:21 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 21:58:21 +0000 |
| commit | 3c6f8e155866a42aed692b88231f4c6a62fae8c7 (patch) | |
| tree | 1be798be384cd76533c66c3bcaf5f1365512fe7d /chrome_frame/chrome_frame_activex_base.h | |
| parent | c2c132c637874d6d3104293791b15b38da58bfc9 (diff) | |
| download | chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.zip chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.tar.gz chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.tar.bz2 | |
Completing Chrome Frame localization by adding the resource script containing the dialog template to Chrome's generated_resources.grd. Associated changes in CF to call _AtlBaseModule.SetResourceInstance to get it to load dialog templates from a resource dll.
BUG=24305
TEST=The Find in page dialog in full tab Chrome Frame is localized.
Review URL: http://codereview.chromium.org/1293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index a8191a9..7240dbe 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -39,6 +39,7 @@ #include "chrome_frame/chrome_frame_plugin.h" #include "chrome_frame/com_message_event.h" #include "chrome_frame/com_type_info_holder.h" +#include "chrome_frame/simple_resource_loader.h" #include "chrome_frame/urlmon_url_request.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" @@ -235,7 +236,16 @@ END_MSG_MAP() DECLARE_PROTECT_FINAL_CONSTRUCT() + virtual void SetResourceModule() { + SimpleResourceLoader* loader_instance = SimpleResourceLoader::instance(); + DCHECK(loader_instance); + HINSTANCE res_dll = loader_instance->GetResourceModuleHandle(); + _AtlBaseModule.SetResourceInstance(res_dll); + } + HRESULT FinalConstruct() { + SetResourceModule(); + if (!Initialize()) return E_OUTOFMEMORY; |