summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/theme_resources.grd10
-rw-r--r--chrome/chrome_repack_chrome_touch_100_percent.gypi28
-rw-r--r--chrome/chrome_resources.gyp13
-rw-r--r--chrome/installer/mini_installer.gyp10
-rw-r--r--chrome/installer/mini_installer.gypi10
-rw-r--r--chrome/installer/mini_installer/chrome.release1
-rw-r--r--chrome/tools/build/win/FILES.cfg5
-rwxr-xr-xchrome/tools/build/win/create_installer_archive.py11
-rw-r--r--ui/resources/ui_resources.grd3
9 files changed, 4 insertions, 87 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 598c75af..16f4c3d 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -18,9 +18,6 @@
<output filename="grit/theme_resources_map.h" type="resource_map_header" context="default_100_percent" />
<output filename="theme_resources_100_percent.pak" type="data_package" context="default_100_percent" />
<output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_percent" />
- <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
- <output filename="theme_resources_touch_140_percent.pak" type="data_package" context="touch_140_percent" />
- <output filename="theme_resources_touch_180_percent.pak" type="data_package" context="touch_180_percent" />
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">
@@ -621,12 +618,7 @@
<if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')">
<structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_icon.png" />
</if>
- <if expr="context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="common/otr_icon.png" />
- </if>
- <if expr="not context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon_fullscreen.png" />
- </if>
+ <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="common/otr_icon.png" />
<structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file="common/overlay_drop_shadow.png" />
<structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" />
<structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" />
diff --git a/chrome/chrome_repack_chrome_touch_100_percent.gypi b/chrome/chrome_repack_chrome_touch_100_percent.gypi
deleted file mode 100644
index 2992d93..0000000
--- a/chrome/chrome_repack_chrome_touch_100_percent.gypi
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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_touch_resources_100_percent',
- 'variables': {
- 'pak_inputs': [
- '<(grit_out_dir)/renderer_resources_100_percent.pak',
- '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
- ],
- 'conditions': [
- ['OS != "ios"', {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
- ],
- }],
- ],
- },
- 'inputs': [
- '<(repack_path)',
- '<@(pak_inputs)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
- ],
- 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index ed5078a..a31ee29 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -375,9 +375,6 @@
{
'includes': ['chrome_repack_chrome_200_percent.gypi']
},
- {
- 'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
- },
],
'conditions': [
['OS != "ios"', {
@@ -453,16 +450,6 @@
},
],
}],
- ['enable_touch_ui==1', {
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
- ],
- },
- ],
- }],
], # conditions
}], # end OS != "mac" and OS != "ios"
], # conditions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index a7be6a6..65e2dd5 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -181,15 +181,6 @@
'enable_hidpi_flag': '',
},
}],
- ['enable_touch_ui == 1', {
- 'variables': {
- 'enable_touch_ui_flag': '--enable_touch_ui=1',
- },
- }, {
- 'variables': {
- 'enable_touch_ui_flag': '',
- },
- }],
['component == "shared_library"', {
'variables': {
'component_build_flag': '--component_build=1',
@@ -259,7 +250,6 @@
'--input_file', '<(RULE_INPUT_PATH)',
'--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
'<(enable_hidpi_flag)',
- '<(enable_touch_ui_flag)',
'<(component_build_flag)',
'<(target_arch_flag)',
# TODO(sgk): may just use environment variables
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index 6f2402d..ef0ccf4 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -163,15 +163,6 @@
'enable_hidpi_flag': '',
},
}],
- ['enable_touch_ui == 1', {
- 'variables': {
- 'enable_touch_ui_flag': '--enable_touch_ui=1',
- },
- }, {
- 'variables': {
- 'enable_touch_ui_flag': '',
- },
- }],
['target_arch=="x64"', {
'inputs!': [
'<(PRODUCT_DIR)/nacl64.exe',
@@ -221,7 +212,6 @@
'--input_file=<(RULE_INPUT_PATH)',
'--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
'<(enable_hidpi_flag)',
- '<(enable_touch_ui_flag)',
'<(target_arch_flag)',
# TODO(sgk): may just use environment variables
#'--distribution=$(CHROMIUM_BUILD)',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 39d2e17..66ab4de 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -50,7 +50,6 @@ locales\*.pak: %(VersionDir)s\Locales
chrome_200_percent.pak: %(VersionDir)s\
[TOUCH]
-chrome_touch_100_percent.pak: %(VersionDir)s\
[GOOGLE_CHROME]
delegate_execute.exe: %(VersionDir)s\
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 7c1defd..0e96eb1 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -77,11 +77,6 @@ FILES = [
'optional': ['dev', 'official'],
},
{
- 'filename': 'chrome_touch_100_percent.pak',
- 'buildtype': ['dev', 'official'],
- 'optional': ['dev', 'official'],
- },
- {
'filename': 'crash_service.exe',
'buildtype': ['dev', 'official'],
},
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index b606fbd..f4ebd5b 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -90,7 +90,7 @@ def CompressUsingLZMA(build_dir, compressed_file, input_file):
def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
- enable_hidpi, enable_touch_ui):
+ enable_hidpi):
"""Copies the files required for installer archive.
Copies all common files required for various distributions of Chromium and
also files for the specific Chromium build specified by distribution.
@@ -103,8 +103,6 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
staging_dir, build_dir)
if enable_hidpi == '1':
CopySectionFilesToStagingDir(config, 'HIDPI', staging_dir, build_dir)
- if enable_touch_ui == '1':
- CopySectionFilesToStagingDir(config, 'TOUCH', staging_dir, build_dir)
def CopySectionFilesToStagingDir(config, section, staging_dir, src_dir):
@@ -511,12 +509,12 @@ def main(options):
if options.build_dir != options.output_dir:
CopyAllFilesToStagingDir(config, options.distribution,
staging_dir, options.output_dir,
- options.enable_hidpi, options.enable_touch_ui)
+ options.enable_hidpi)
# Now copy the remainder of the files from the build dir.
CopyAllFilesToStagingDir(config, options.distribution,
staging_dir, options.build_dir,
- options.enable_hidpi, options.enable_touch_ui)
+ options.enable_hidpi)
if options.component_build == '1':
DoComponentBuildTasks(staging_dir, options.build_dir,
@@ -574,9 +572,6 @@ def _ParseOptions():
help='Name used to prefix names of generated archives.')
parser.add_option('--enable_hidpi', default='0',
help='Whether to include HiDPI resource files.')
- parser.add_option('--enable_touch_ui', default='0',
- help='Whether to include resource files from the "TOUCH" section of the '
- 'input file.')
parser.add_option('--component_build', default='0',
help='Whether this archive is packaging a component build. This will '
'also turn off compression of chrome.7z into chrome.packed.7z and '
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 026a478c..3a87a28 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -8,9 +8,6 @@
<output filename="grit/ui_resources_map.h" type="resource_map_header" context="default_100_percent" />
<output filename="ui_resources_100_percent.pak" type="data_package" context="default_100_percent" />
<output filename="ui_resources_200_percent.pak" type="data_package" context="default_200_percent" />
- <output filename="ui_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
- <output filename="ui_resources_touch_140_percent.pak" type="data_package" context="touch_140_percent" />
- <output filename="ui_resources_touch_180_percent.pak" type="data_package" context="touch_180_percent" />
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">
generated by cgit v1.1 at 2024-12-24 19:44:26 +0000