diff options
| author | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:14:15 +0000 |
|---|---|---|
| committer | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:14:15 +0000 |
| commit | 58ba3eab5af91f112de6a26856f07cdd46cde35e (patch) | |
| tree | b9fa5046900e2003926caee62454dc572ea9508d /content/shell | |
| parent | 4b50cf797e2a1b5026da2b03a6f3c6e6f8065d5d (diff) | |
| download | chromium_src-58ba3eab5af91f112de6a26856f07cdd46cde35e.zip chromium_src-58ba3eab5af91f112de6a26856f07cdd46cde35e.tar.gz chromium_src-58ba3eab5af91f112de6a26856f07cdd46cde35e.tar.bz2 | |
Convert base::MemoryMappedFile to use File instead of PlatformFile.
This also modifies consumers of MemoryMappedFile and fixes double handle
close on MediaFileChecker, media_file_checker_unittest and data_pack_unittests.
BUG=322664
TEST=unit tests
R=cpu@chromium.org, dalecurtis@chromium.org (media)
TBR (owners):
tony@chromium.org (resource)
jochen@chromium.org (chrome-content)
thakis@chromium.org (base)
Review URL: https://codereview.chromium.org/109273002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/app/shell_main_delegate.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index 9966c4a..9867be7 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -259,9 +259,10 @@ void ShellMainDelegate::InitializeResourceBundle() { int pak_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(kShellPakDescriptor); if (pak_fd != base::kInvalidPlatformFileValue) { - ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_fd, false); + ui::ResourceBundle::InitSharedInstanceWithPakFile(base::File(pak_fd), + false); ResourceBundle::GetSharedInstance().AddDataPackFromFile( - pak_fd, ui::SCALE_FACTOR_100P); + base::File(pak_fd), ui::SCALE_FACTOR_100P); return; } #endif |