diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 19:18:04 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 19:18:04 +0000 |
| commit | 6c26d9cf2d0ee13c4ab67040923c953c50e0d41b (patch) | |
| tree | 0920a14cb3544ea100a21ebcb65b97b673472c33 /chrome_frame | |
| parent | 81f2dba7d7e3af616501d65920599dad4bb948e7 (diff) | |
| download | chromium_src-6c26d9cf2d0ee13c4ab67040923c953c50e0d41b.zip chromium_src-6c26d9cf2d0ee13c4ab67040923c953c50e0d41b.tar.gz chromium_src-6c26d9cf2d0ee13c4ab67040923c953c50e0d41b.tar.bz2 | |
Add methods to add DataPack from open files
On Android, renderer sandboxing prevents us from opening files and so
ResourceBundle is initialized with file descriptors passed in at process
creation. This change adds methods to DataPack and ResourceBundle to
support loading/initializing from PlatformFile in addition to the
current FilePath.
Also, the current methods are renamed so that the naming is consistent
between these two files.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10686005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/simple_resource_loader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 72ab076..13d42f4 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -207,7 +207,7 @@ bool SimpleResourceLoader::LoadLocalePack( file_util::PathExists(dll_path)) { scoped_ptr<ui::DataPack> cur_data_pack( new ui::DataPack(ui::SCALE_FACTOR_100P)); - if (!cur_data_pack->Load(resource_pack_path)) + if (!cur_data_pack->LoadFromPath(resource_pack_path)) continue; HMODULE locale_dll_handle = LoadLibraryEx(dll_path.value().c_str(), NULL, |