Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 402603006: [android_webview] Do not extract webviewchromium.pak (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@awassets
Patch Set: Use only InitSharedInstanceWithPakFileRegion and + rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index b532bf00ed8d04f5207af724b353880e80420f5a..ff078208fd5b9443483e5354f7c2c113ca463c40 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -264,8 +264,8 @@ void ShellMainDelegate::InitializeResourceBundle() {
base::GlobalDescriptors::GetInstance()->MaybeGet(kShellPakDescriptor);
if (pak_fd >= 0) {
// This is clearly wrong. See crbug.com/330930
- ui::ResourceBundle::InitSharedInstanceWithPakFile(base::File(pak_fd),
- false);
+ ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
+ base::File(pak_fd), base::MemoryMappedFile::Region::kWholeFile, false);
ResourceBundle::GetSharedInstance().AddDataPackFromFile(
base::File(pak_fd), ui::SCALE_FACTOR_100P);
return;
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698