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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix Created 7 years, 11 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/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc (revision 177707)
+++ chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -1829,7 +1829,7 @@
data_path.AppendASCII("chrome_100_percent.pak");
f = base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL);
DCHECK(f != base::kInvalidPlatformFileValue);
- mappings->push_back(FileDescriptorInfo(kAndroidUIResourcesPakDescriptor,
+ mappings->push_back(FileDescriptorInfo(kAndroidChrome100PercentPakDescriptor,
FileDescriptor(f, true)));
const std::string locale = GetApplicationLocale();
@@ -1840,6 +1840,13 @@
mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor,
FileDescriptor(f, true)));
+ FilePath resources_pack_path;
+ PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
+ f = base::CreatePlatformFile(resources_pack_path, flags, NULL, NULL);
+ DCHECK(f != base::kInvalidPlatformFileValue);
+ mappings->push_back(FileDescriptorInfo(kAndroidUIResourcesPakDescriptor,
+ FileDescriptor(f, true)));
+
#if defined(USE_LINUX_BREAKPAD)
f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id);
if (f == base::kInvalidPlatformFileValue) {
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698