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

Unified Diff: trunk/src/chrome/browser/chrome_content_browser_client.cc

Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « trunk/src/chrome/app/chrome_main_delegate.cc ('k') | trunk/src/chrome/browser_tests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chrome_content_browser_client.cc
===================================================================
--- trunk/src/chrome/browser/chrome_content_browser_client.cc (revision 216822)
+++ trunk/src/chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -2465,10 +2465,16 @@
DCHECK(!data_path.empty());
int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
+ base::FilePath chrome_pak = data_path.AppendASCII("chrome.pak");
+ base::PlatformFile f =
+ base::CreatePlatformFile(chrome_pak, flags, NULL, NULL);
+ DCHECK(f != base::kInvalidPlatformFileValue);
+ mappings->push_back(FileDescriptorInfo(kAndroidChromePakDescriptor,
+ FileDescriptor(f, true)));
+
base::FilePath chrome_resources_pak =
data_path.AppendASCII("chrome_100_percent.pak");
- base::PlatformFile f =
- base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL);
+ f = base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL);
DCHECK(f != base::kInvalidPlatformFileValue);
mappings->push_back(FileDescriptorInfo(kAndroidChrome100PercentPakDescriptor,
FileDescriptor(f, true)));
« no previous file with comments | « trunk/src/chrome/app/chrome_main_delegate.cc ('k') | trunk/src/chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698