summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 15:26:34 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 15:26:34 +0000
commit411896b813b8ce20c6e87d732987f0d8407f5937 (patch)
tree0188b888be280637d6f1469a79179a553f6596e9 /android_webview
parentb14d9fabd4a0f635691d1a40fde8e1c99cba892a (diff)
downloadchromium_src-411896b813b8ce20c6e87d732987f0d8407f5937.zip
chromium_src-411896b813b8ce20c6e87d732987f0d8407f5937.tar.gz
chromium_src-411896b813b8ce20c6e87d732987f0d8407f5937.tar.bz2
Drop the bool parameter from InitSharedInstanceWithPakFileRegion().
We always pass false to it, so we will never load the common resources. The benefit of doing this is that it allow us to remove a call to LoadCommonResources(), which we are trying to remove. BUG=176960 TEST=None R=tony@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/451283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_browser_main_parts.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 459e1b5..f0785f9 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -64,9 +64,7 @@ int AwBrowserMainParts::PreCreateThreads() {
<< " len=" << pak_len;
ui::ResourceBundle::CleanupSharedInstance();
ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
- base::File(pak_fd),
- base::MemoryMappedFile::Region(pak_off, pak_len),
- /*should_load_common_resources=*/false);
+ base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len));
} else {
LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
"Bringing up WebView without any locale";