diff options
24 files changed, 84 insertions, 18 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index a929727..82fb264 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -905,6 +905,7 @@ 'shell/cocoa/app-Info.plist', 'shell/cocoa/nibs/MainMenu.xib', 'shell/cocoa/nibs/RootWindow.xib', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', ], 'mac_bundle_resources!': [ diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java index 2a4a5fc..98c5f0a 100644 --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java @@ -18,6 +18,7 @@ public class ChromiumTestShellApplication extends Application { private static final String TAG = "ChromiumTestShellApplication"; private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshell"; private static final String[] CHROME_MANDATORY_PAKS = { + "chrome.pak", "en-US.pak", "resources.pak", "chrome_100_percent.pak", diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 7137dc7..4825c3f 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -662,6 +662,7 @@ void ChromeMainDelegate::PreSandboxStartup() { ResourceBundle::InitSharedInstanceWithPakFile(locale_pak_fd, false); int extra_pak_keys[] = { + kAndroidChromePakDescriptor, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, }; diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 7802189..4700b5a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2465,10 +2465,16 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 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))); diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 77d52b27..79ffdc0 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -14,6 +14,7 @@ ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 263a82c..86233c4 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -6,6 +6,7 @@ ['OS=="linux"', { 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index c7e96d5..6a95ee5 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -5,6 +5,7 @@ 'variables': { 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/am.pak', diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 57bd2b9..9b8d1af 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -61,6 +61,7 @@ 'app/theme/menu_overflow_down.pdf', 'app/theme/menu_overflow_up.pdf', 'browser/mac/install.sh', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 37f840b..8543946 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -552,6 +552,7 @@ # TODO(mmoss) Any convenient way to get all the relevant build # files? (e.g. all locales, resources, etc.) '<(PRODUCT_DIR)/chrome', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome_sandbox', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', diff --git a/chrome/chrome_ios_bundle_resources.gypi b/chrome/chrome_ios_bundle_resources.gypi index efcb5f8..988654b 100644 --- a/chrome/chrome_ios_bundle_resources.gypi +++ b/chrome/chrome_ios_bundle_resources.gypi @@ -7,6 +7,7 @@ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', ], 'mac_bundle_resources': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi new file mode 100644 index 0000000..a895435 --- /dev/null +++ b/chrome/chrome_repack_chrome.gypi @@ -0,0 +1,36 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'action_name': 'repack_chrome', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/browser_resources.pak', + '<(grit_out_dir)/common_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + ], + 'conditions': [ + ['OS != "ios"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + ], + }], + ['enable_extensions==1', { + 'pak_inputs': [ + '<(grit_out_dir)/extensions_api_resources.pak', + ], + }], + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], +} diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 7480c2d..8519aab 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -5,26 +5,14 @@ 'action_name': 'repack_resources', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', - '<(grit_out_dir)/browser_resources.pak', - '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/memory_internals_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/signin_internals_resources.pak', '<(grit_out_dir)/sync_internals_resources.pak', '<(grit_out_dir)/translate_internals_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], 'conditions': [ - ['OS != "ios"', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(grit_out_dir)/devtools_discovery_page_resources.pak', - ], - }], ['OS != "ios" and OS != "android"', { # New paks should be added here by default. 'pak_inputs': [ @@ -35,9 +23,9 @@ '<(grit_out_dir)/sync_file_system_internals_resources.pak', ], }], - ['enable_extensions==1', { + ['OS != "ios"', { 'pak_inputs': [ - '<(grit_out_dir)/extensions_api_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', ], }], ], diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 7eb55c4..3084064 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -319,6 +319,9 @@ ], 'actions': [ { + 'includes': ['chrome_repack_chrome.gypi'] + }, + { 'includes': ['chrome_repack_locales.gypi'] }, { diff --git a/chrome/common/descriptors_android.h b/chrome/common/descriptors_android.h index f18a8c6..16886e9 100644 --- a/chrome/common/descriptors_android.h +++ b/chrome/common/descriptors_android.h @@ -9,7 +9,8 @@ enum { #if defined(OS_ANDROID) - kAndroidLocalePakDescriptor = kContentIPCDescriptorMax + 1, + kAndroidChromePakDescriptor = kContentIPCDescriptorMax + 1, + kAndroidLocalePakDescriptor, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, kAndroidMinidumpDescriptor, diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index d9e8621..554fdd0 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -14,6 +14,7 @@ ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/pyproto/google/__init__.py', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 71b8fde..30fd0a5 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -14,6 +14,7 @@ 'isolate_dependency_tracked': [ '../testing/test_env.py', '../testing/xvfb.py', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg index 97e002a..4bf94e4 100644 --- a/chrome/tools/build/chromeos/FILES.cfg +++ b/chrome/tools/build/chromeos/FILES.cfg @@ -33,6 +33,10 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'chrome.pak', + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'chrome_100_percent.pak', 'buildtype': ['dev', 'official'], }, diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index a0a844e..93bf017 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -36,6 +36,10 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'chrome.pak', + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'chrome_100_percent.pak', 'buildtype': ['dev', 'official'], }, diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index af2f167..59b789d 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -5,6 +5,9 @@ 'conditions': [ ['OS=="android" or OS=="linux"', { 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome.pak', + ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/test_data/', ], diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc index b194269..c701a291 100644 --- a/ui/base/resource/resource_bundle_android.cc +++ b/ui/base/resource/resource_bundle_android.cc @@ -19,6 +19,8 @@ namespace ui { void ResourceBundle::LoadCommonResources() { base::FilePath path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); + AddDataPackFromPath(path.AppendASCII("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"), SCALE_FACTOR_100P); } diff --git a/ui/base/resource/resource_bundle_auralinux.cc b/ui/base/resource/resource_bundle_auralinux.cc index d535717..4bc7ee6 100644 --- a/ui/base/resource/resource_bundle_auralinux.cc +++ b/ui/base/resource/resource_bundle_auralinux.cc @@ -33,6 +33,9 @@ void ResourceBundle::LoadCommonResources() { // Always load the 1x data pack first as the 2x data pack contains both 1x and // 2x images. The 1x data pack only has 1x images, thus passes in an accurate // scale factor to gfx::ImageSkia::AddRepresentation. + + AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc index 679b85c..4d16b61 100644 --- a/ui/base/resource/resource_bundle_gtk.cc +++ b/ui/base/resource/resource_bundle_gtk.cc @@ -65,6 +65,8 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) { } // namespace void ResourceBundle::LoadCommonResources() { + AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 56d16d5..5de8ecc 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -49,6 +49,8 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { } // namespace void ResourceBundle::LoadCommonResources() { + AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil), + SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil), SCALE_FACTOR_100P); AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent", diff --git a/ui/ui_unittests.isolate b/ui/ui_unittests.isolate index 55ce04a..35f732b 100644 --- a/ui/ui_unittests.isolate +++ b/ui/ui_unittests.isolate @@ -7,6 +7,7 @@ 'variables': { 'isolate_dependency_tracked': [ 'base/test/data/data_pack_unittest/truncated-header.pak', + '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], }, |