Commit b34c55a6 authored by avi's avatar avi Committed by Commit bot

Clean up pak loading.

- kEmptyPakContents was malformed; fix it
- chrome.pak was deleted half a year ago for iOS Chrome; don't try to load it

BUG=410411
TEST=no visible change

Review URL: https://codereview.chromium.org/611103002

Cr-Commit-Position: refs/heads/master@{#297210}
parent cb017311
...@@ -51,7 +51,8 @@ extern const size_t kSamplePakSize2x = sizeof(kSamplePakContents2x); ...@@ -51,7 +51,8 @@ extern const size_t kSamplePakSize2x = sizeof(kSamplePakContents2x);
extern const char kEmptyPakContents[] = { extern const char kEmptyPakContents[] = {
0x04, 0x00, 0x00, 0x00, // header(version 0x04, 0x00, 0x00, 0x00, // header(version
0x00, 0x00, 0x00, 0x00, // no. entries 0x00, 0x00, 0x00, 0x00, // no. entries
0x01 0x01, // encoding)
0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 // extra entry for the size of last
}; };
extern const size_t kEmptyPakSize = sizeof(kEmptyPakContents); extern const size_t kEmptyPakSize = sizeof(kEmptyPakContents);
......
...@@ -44,9 +44,6 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { ...@@ -44,9 +44,6 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
} // namespace } // namespace
void ResourceBundle::LoadCommonResources() { void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
ui::SCALE_FACTOR_NONE);
if (IsScaleFactorSupported(SCALE_FACTOR_100P)) { if (IsScaleFactorSupported(SCALE_FACTOR_100P)) {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil), AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil),
SCALE_FACTOR_100P); SCALE_FACTOR_100P);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment