diff options
123 files changed, 0 insertions, 45 deletions
diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py index 96aa98a..b3e99c9 100644 --- a/chrome/app/theme/PRESUBMIT.py +++ b/chrome/app/theme/PRESUBMIT.py @@ -29,7 +29,6 @@ def _CommonChecks(input_api, output_api): # that the images modified in one are the correct scale of the other. path_scales = [ [(1, 'default_100_percent/'), (2, 'default_200_percent/')], - [(1, 'touch_100_percent/'), (2, 'touch_200_percent/')], ] import sys diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 50070cb..3689ad6 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -9,7 +9,6 @@ <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_200_percent.pak" type="data_package" context="touch_200_percent" /> </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> diff --git a/chrome/app/theme/touch_200_percent/ash/browser_action_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_action_hover.png Binary files differdeleted file mode 100644 index efa97aa..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_action_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_action_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_action_normal.png Binary files differdeleted file mode 100644 index 38a8a27..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_action_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_action_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_action_pressed.png Binary files differdeleted file mode 100644 index c2c5d31..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_action_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_hover.png Binary files differdeleted file mode 100644 index 26edeb7..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_normal.png Binary files differdeleted file mode 100644 index 6ece228..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_pressed.png Binary files differdeleted file mode 100644 index 405da78..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_actions_overflow_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_back_disabled.png b/chrome/app/theme/touch_200_percent/ash/browser_back_disabled.png Binary files differdeleted file mode 100644 index 46d29cf..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_back_disabled.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_back_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_back_hover.png Binary files differdeleted file mode 100644 index 80314cf7..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_back_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_back_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_back_normal.png Binary files differdeleted file mode 100644 index 92f3ba3..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_back_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_back_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_back_pressed.png Binary files differdeleted file mode 100644 index a6d416d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_back_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_forward_disabled.png b/chrome/app/theme/touch_200_percent/ash/browser_forward_disabled.png Binary files differdeleted file mode 100644 index 379f26f..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_forward_disabled.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_forward_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_forward_hover.png Binary files differdeleted file mode 100644 index d0af6c7..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_forward_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_forward_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_forward_normal.png Binary files differdeleted file mode 100644 index 3a5f5d6..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_forward_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_forward_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_forward_pressed.png Binary files differdeleted file mode 100644 index 8f4ec4d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_forward_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_home_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_home_hover.png Binary files differdeleted file mode 100644 index dfd336b..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_home_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_home_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_home_normal.png Binary files differdeleted file mode 100644 index 69facd0..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_home_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_home_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_home_pressed.png Binary files differdeleted file mode 100644 index d4683e6..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_home_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_left.png b/chrome/app/theme/touch_200_percent/ash/browser_omnibox_left.png Binary files differdeleted file mode 100644 index fda4114..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_middle.png b/chrome/app/theme/touch_200_percent/ash/browser_omnibox_middle.png Binary files differdeleted file mode 100644 index 969168d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_middle.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_right.png b/chrome/app/theme/touch_200_percent/ash/browser_omnibox_right.png Binary files differdeleted file mode 100644 index c10ba7d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_omnibox_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_reload_disabled.png b/chrome/app/theme/touch_200_percent/ash/browser_reload_disabled.png Binary files differdeleted file mode 100644 index f63114a..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_reload_disabled.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_reload_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_reload_hover.png Binary files differdeleted file mode 100644 index bf056d6..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_reload_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_reload_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_reload_normal.png Binary files differdeleted file mode 100644 index 421327f..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_reload_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_reload_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_reload_pressed.png Binary files differdeleted file mode 100644 index e68cea0..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_reload_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_stop_disabled.png b/chrome/app/theme/touch_200_percent/ash/browser_stop_disabled.png Binary files differdeleted file mode 100644 index 4698acf..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_stop_disabled.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_stop_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_stop_hover.png Binary files differdeleted file mode 100644 index 3837c70..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_stop_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_stop_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_stop_normal.png Binary files differdeleted file mode 100644 index 244716a..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_stop_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_stop_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_stop_pressed.png Binary files differdeleted file mode 100644 index e22aa31..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_stop_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_tools_hover.png b/chrome/app/theme/touch_200_percent/ash/browser_tools_hover.png Binary files differdeleted file mode 100644 index c0cbf632..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_tools_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_tools_normal.png b/chrome/app/theme/touch_200_percent/ash/browser_tools_normal.png Binary files differdeleted file mode 100644 index eb2a2bd..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_tools_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/browser_tools_pressed.png b/chrome/app/theme/touch_200_percent/ash/browser_tools_pressed.png Binary files differdeleted file mode 100644 index f6ec96e..0000000 --- a/chrome/app/theme/touch_200_percent/ash/browser_tools_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/newtab.png b/chrome/app/theme/touch_200_percent/ash/newtab.png Binary files differdeleted file mode 100644 index 3de6ae1..0000000 --- a/chrome/app/theme/touch_200_percent/ash/newtab.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/newtab_button_mask.png b/chrome/app/theme/touch_200_percent/ash/newtab_button_mask.png Binary files differdeleted file mode 100644 index 3832a44..0000000 --- a/chrome/app/theme/touch_200_percent/ash/newtab_button_mask.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/newtab_pressed.png b/chrome/app/theme/touch_200_percent/ash/newtab_pressed.png Binary files differdeleted file mode 100644 index 1d1ad1ba..0000000 --- a/chrome/app/theme/touch_200_percent/ash/newtab_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_active_center.png b/chrome/app/theme/touch_200_percent/ash/tab_active_center.png Binary files differdeleted file mode 100644 index 5682a81..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_active_center.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_active_left.png b/chrome/app/theme/touch_200_percent/ash/tab_active_left.png Binary files differdeleted file mode 100644 index 1a08b67..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_active_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_active_right.png b/chrome/app/theme/touch_200_percent/ash/tab_active_right.png Binary files differdeleted file mode 100644 index 226fb8a..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_active_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_alpha_left.png b/chrome/app/theme/touch_200_percent/ash/tab_alpha_left.png Binary files differdeleted file mode 100644 index 29beacd..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_alpha_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_alpha_right.png b/chrome/app/theme/touch_200_percent/ash/tab_alpha_right.png Binary files differdeleted file mode 100644 index 0bf961b..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_alpha_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_close_hover.png b/chrome/app/theme/touch_200_percent/ash/tab_close_hover.png Binary files differdeleted file mode 100644 index f8e436f..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_close_hover.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_close_mask.png b/chrome/app/theme/touch_200_percent/ash/tab_close_mask.png Binary files differdeleted file mode 100644 index 8b4c34d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_close_mask.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_close_normal.png b/chrome/app/theme/touch_200_percent/ash/tab_close_normal.png Binary files differdeleted file mode 100644 index 079e07d..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_close_normal.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_close_pressed.png b/chrome/app/theme/touch_200_percent/ash/tab_close_pressed.png Binary files differdeleted file mode 100644 index f7aa1fb..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_close_pressed.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_inactive_center.png b/chrome/app/theme/touch_200_percent/ash/tab_inactive_center.png Binary files differdeleted file mode 100644 index 199366b..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_inactive_center.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_inactive_left.png b/chrome/app/theme/touch_200_percent/ash/tab_inactive_left.png Binary files differdeleted file mode 100644 index c2db584..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_inactive_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/tab_inactive_right.png b/chrome/app/theme/touch_200_percent/ash/tab_inactive_right.png Binary files differdeleted file mode 100644 index 2f18c21..0000000 --- a/chrome/app/theme/touch_200_percent/ash/tab_inactive_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/theme_frame_default_active.png b/chrome/app/theme/touch_200_percent/ash/theme_frame_default_active.png Binary files differdeleted file mode 100644 index f9186e2..0000000 --- a/chrome/app/theme/touch_200_percent/ash/theme_frame_default_active.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/theme_frame_default_inactive.png b/chrome/app/theme/touch_200_percent/ash/theme_frame_default_inactive.png Binary files differdeleted file mode 100644 index 09d6b02..0000000 --- a/chrome/app/theme/touch_200_percent/ash/theme_frame_default_inactive.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_active.png b/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_active.png Binary files differdeleted file mode 100644 index 4d73b57..0000000 --- a/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_active.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_inactive.png b/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_inactive.png Binary files differdeleted file mode 100644 index d9f4ddc..0000000 --- a/chrome/app/theme/touch_200_percent/ash/theme_frame_incognito_inactive.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom.png Binary files differdeleted file mode 100644 index 9f9eea5..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_left.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_left.png Binary files differdeleted file mode 100644 index 9380960..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_right.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_right.png Binary files differdeleted file mode 100644 index d68b1c7..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_bottom_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_left.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_left.png Binary files differdeleted file mode 100644 index fc2ab85..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_left.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_line.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_line.png Binary files differdeleted file mode 100644 index 95fa562..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_line.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_right.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_right.png Binary files differdeleted file mode 100644 index 8dcb6d2..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_right.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_top.png b/chrome/app/theme/touch_200_percent/ash/toolbar_shade_top.png Binary files differdeleted file mode 100644 index 4f1ca53..0000000 --- a/chrome/app/theme/touch_200_percent/ash/toolbar_shade_top.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/incognito_background.png b/chrome/app/theme/touch_200_percent/incognito_background.png Binary files differdeleted file mode 100644 index 89fd9a4..0000000 --- a/chrome/app/theme/touch_200_percent/incognito_background.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/incognito_switch_off.png b/chrome/app/theme/touch_200_percent/incognito_switch_off.png Binary files differdeleted file mode 100644 index 50e4a2e..0000000 --- a/chrome/app/theme/touch_200_percent/incognito_switch_off.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/incognito_switch_on.png b/chrome/app/theme/touch_200_percent/incognito_switch_on.png Binary files differdeleted file mode 100644 index bef158f..0000000 --- a/chrome/app/theme/touch_200_percent/incognito_switch_on.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/otr_icon.png b/chrome/app/theme/touch_200_percent/otr_icon.png Binary files differdeleted file mode 100644 index 66adafd..0000000 --- a/chrome/app/theme/touch_200_percent/otr_icon.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/otr_icon_fullscreen.png b/chrome/app/theme/touch_200_percent/otr_icon_fullscreen.png Binary files differdeleted file mode 100644 index 919a114..0000000 --- a/chrome/app/theme/touch_200_percent/otr_icon_fullscreen.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/zoom_minus.png b/chrome/app/theme/touch_200_percent/zoom_minus.png Binary files differdeleted file mode 100644 index 083d1de..0000000 --- a/chrome/app/theme/touch_200_percent/zoom_minus.png +++ /dev/null diff --git a/chrome/app/theme/touch_200_percent/zoom_plus.png b/chrome/app/theme/touch_200_percent/zoom_plus.png Binary files differdeleted file mode 100644 index 0288fa5..0000000 --- a/chrome/app/theme/touch_200_percent/zoom_plus.png +++ /dev/null diff --git a/chrome/chrome_repack_chrome_touch_200_percent.gypi b/chrome/chrome_repack_chrome_touch_200_percent.gypi deleted file mode 100644 index 33cbb4f..0000000 --- a/chrome/chrome_repack_chrome_touch_200_percent.gypi +++ /dev/null @@ -1,21 +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_200_percent', - 'variables': { - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_touch_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', - ], - }, - 'inputs': [ - '<(repack_path)', - '<@(pak_inputs)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak', - ], - 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], -} diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index fe6d9af..c31bab2 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -293,9 +293,6 @@ { 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] }, - { - 'includes': ['chrome_repack_chrome_touch_200_percent.gypi'] - }, ], 'conditions': [ ['OS != "mac"', { @@ -368,16 +365,6 @@ }, ], }], - ['enable_hidpi == 1 and enable_touch_ui==1', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak', - ], - }, - ], - }], ], # conditions }], # end OS != "mac" ], # conditions diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc index 7ff4a12..0da0e25 100644 --- a/ui/base/resource/resource_bundle_aurax11.cc +++ b/ui/base/resource/resource_bundle_aurax11.cc @@ -42,13 +42,6 @@ void ResourceBundle::LoadCommonResources() { AddDataPackFromPath(GetResourcesPakFilePath( "chrome_touch_100_percent.pak"), SCALE_FACTOR_100P); - - // 2x touch - // TODO(flackr): Don't log an error message if these are not found as this - // is an expected case in ChromeOS. - AddDataPackFromPath(GetResourcesPakFilePath( - "chrome_touch_200_percent.pak"), - SCALE_FACTOR_200P); } else { // 1x non touch AddDataPackFromPath(GetResourcesPakFilePath( diff --git a/ui/resources/PRESUBMIT.py b/ui/resources/PRESUBMIT.py index ba38b71..9b2c4dd 100644 --- a/ui/resources/PRESUBMIT.py +++ b/ui/resources/PRESUBMIT.py @@ -28,7 +28,6 @@ def _CommonChecks(input_api, output_api): # that the images modified in one are the correct scale of the other. path_scales = [ [(1, 'default_100_percent/'), (2, 'default_200_percent/')], - [(1, 'touch_100_percent/'), (2, 'touch_200_percent/')], ] import sys diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png Binary files differdeleted file mode 100644 index a810568..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png Binary files differdeleted file mode 100644 index 7b06819..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png Binary files differdeleted file mode 100644 index 8e2973f..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png Binary files differdeleted file mode 100644 index 8c67fa6..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 7fa87c7..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png Binary files differdeleted file mode 100644 index d48277f..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 5870e86..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png b/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png Binary files differdeleted file mode 100644 index 8a11695..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png b/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png Binary files differdeleted file mode 100644 index a997c65..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index 1547ddd..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png Binary files differdeleted file mode 100644 index 161bc37..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png Binary files differdeleted file mode 100644 index 0aaf4e9..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png Binary files differdeleted file mode 100644 index bd9539b..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index fe6ddeb..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png Binary files differdeleted file mode 100644 index 14bfc993..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png Binary files differdeleted file mode 100644 index 66c7a19..0000000 --- a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png Binary files differdeleted file mode 100644 index cb99e0e..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png Binary files differdeleted file mode 100644 index e23a8e3..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png Binary files differdeleted file mode 100644 index cad1559..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 7d1a140..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png Binary files differdeleted file mode 100644 index 5ce29a6..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 29dcd84..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png Binary files differdeleted file mode 100644 index 3d6bbe3..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png Binary files differdeleted file mode 100644 index 8e6c835..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png Binary files differdeleted file mode 100644 index 94a1db2..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index cd91f17..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png Binary files differdeleted file mode 100644 index e381097..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png Binary files differdeleted file mode 100644 index 4d9532e..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index c55365c..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png Binary files differdeleted file mode 100644 index d5a805c..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png Binary files differdeleted file mode 100644 index dcfe08d..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png Binary files differdeleted file mode 100644 index aa16a4f..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png Binary files differdeleted file mode 100644 index 1ee4c9e..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png Binary files differdeleted file mode 100644 index 90a0bba..0000000 --- a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_bottom.png b/ui/resources/touch_200_percent/textbutton_hover_bottom.png Binary files differdeleted file mode 100644 index ccca653..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_bottom_left.png b/ui/resources/touch_200_percent/textbutton_hover_bottom_left.png Binary files differdeleted file mode 100644 index 444564e..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_bottom_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_bottom_right.png b/ui/resources/touch_200_percent/textbutton_hover_bottom_right.png Binary files differdeleted file mode 100644 index 73f57e7..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_bottom_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_center.png b/ui/resources/touch_200_percent/textbutton_hover_center.png Binary files differdeleted file mode 100644 index 7ed58ab..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_left.png b/ui/resources/touch_200_percent/textbutton_hover_left.png Binary files differdeleted file mode 100644 index 669392f..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_right.png b/ui/resources/touch_200_percent/textbutton_hover_right.png Binary files differdeleted file mode 100644 index b3b4dac..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_top.png b/ui/resources/touch_200_percent/textbutton_hover_top.png Binary files differdeleted file mode 100644 index 98a8848..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_top_left.png b/ui/resources/touch_200_percent/textbutton_hover_top_left.png Binary files differdeleted file mode 100644 index 6b782d8..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_top_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_hover_top_right.png b/ui/resources/touch_200_percent/textbutton_hover_top_right.png Binary files differdeleted file mode 100644 index 53066c8..0000000 --- a/ui/resources/touch_200_percent/textbutton_hover_top_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_bottom.png b/ui/resources/touch_200_percent/textbutton_pressed_bottom.png Binary files differdeleted file mode 100644 index 20505df..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_bottom.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_bottom_left.png b/ui/resources/touch_200_percent/textbutton_pressed_bottom_left.png Binary files differdeleted file mode 100644 index 48749ec..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_bottom_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_bottom_right.png b/ui/resources/touch_200_percent/textbutton_pressed_bottom_right.png Binary files differdeleted file mode 100644 index fd8235f..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_bottom_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_center.png b/ui/resources/touch_200_percent/textbutton_pressed_center.png Binary files differdeleted file mode 100644 index 21ad262..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_center.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_left.png b/ui/resources/touch_200_percent/textbutton_pressed_left.png Binary files differdeleted file mode 100644 index 6d992f3..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_right.png b/ui/resources/touch_200_percent/textbutton_pressed_right.png Binary files differdeleted file mode 100644 index 6feda4a..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_right.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_top.png b/ui/resources/touch_200_percent/textbutton_pressed_top.png Binary files differdeleted file mode 100644 index 9b3fcca..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_top.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_top_left.png b/ui/resources/touch_200_percent/textbutton_pressed_top_left.png Binary files differdeleted file mode 100644 index 7ce492b..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_top_left.png +++ /dev/null diff --git a/ui/resources/touch_200_percent/textbutton_pressed_top_right.png b/ui/resources/touch_200_percent/textbutton_pressed_top_right.png Binary files differdeleted file mode 100644 index 048dad9..0000000 --- a/ui/resources/touch_200_percent/textbutton_pressed_top_right.png +++ /dev/null diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 02493c7..10b667d 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -12,7 +12,6 @@ <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_200_percent.pak" type="data_package" context="touch_200_percent" /> </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> |
