summaryrefslogtreecommitdiffstats
path: root/build/ios
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 17:54:36 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 17:54:36 +0000
commit0bf53d21ec308f35a8adcaf0d093a4959deae5c1 (patch)
tree6c8d54b4425fc58392106036f4aeebf2700f59ea /build/ios
parentdd204dc2d0055e511cba23bae525829156058ab4 (diff)
downloadchromium_src-0bf53d21ec308f35a8adcaf0d093a4959deae5c1.zip
chromium_src-0bf53d21ec308f35a8adcaf0d093a4959deae5c1.tar.gz
chromium_src-0bf53d21ec308f35a8adcaf0d093a4959deae5c1.tar.bz2
Revert 190431 "Inconsistent use of [x] close panel icon"
> Inconsistent use of [x] close panel icon > The close button in download pane should be the tab close button asset : tab_close_*.png > (this was originally reported as part of BUG=173251). > > By the same logic the same smaller bitmap with red hover background should be used for all infobars > such as translate bar, save password bar, etc. It should also be used for find-in-page bar on all > platforms (Mac was missed with the previous implementation). > > The close button in the chrome UI and Web UI bubbles was left the same as before (this needs to be regression-tested). > > Code was rearranged to make explicit the disrepancy between the IDR_CLOSE_BAR and IDR_CLOSE_BUBBLE. > IDR_TAB_CLOSE was renamed IDR_CLOSE_1. > IDR_CLOSE_BAR was renamed IDR_CLOSE_2. > png files were also renamed. > > BUG=217094 > TEST=Open any page that downloads an attachment such as gmail email with an attachment or a page with images. Download an image or an attachment. Verify that the close button in download bar at the bottom of the screen has a red circular background when mouse hovers over it - same as the close tab button. > > TEST=Open find-in-page (Ctrl+F) box on Mac, Linux and Windows and check that the close button is same as tab close (has a red circular background when mouse hovers over it). > > TEST=Open any infobar (translate / save password) on both ChromeOS and linux and check that the close button is same as tab close (has a red circular background when mouse hovers over it). Opening a non-English news page is usually the easiest way. > > TEST=Trigger chrome to show a toolbar bubble such as extension installed bubble that shows when an extension is installed from chrome web store (see bitmaps in comments attached to BUG=217094). Confirm that the close buttons in those bubbles are NOT changed from before the change (they should NOT have the red circular background when mouse hovers over). > > Review URL: https://codereview.chromium.org/12634025 TBR=flackr@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
-rw-r--r--build/ios/grit_whitelist.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 2c7f661..705c939 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -1,8 +1,6 @@
IDR_ABOUT_VERSION_HTML
IDR_ABOUT_VERSION_JS
IDR_BOOKMARK_BAR_FOLDER
-IDR_CLOSE_1_MASK
-IDR_CLOSE_1_P
IDR_CRASHES_HTML
IDR_CRASHES_JS
IDR_CREDITS_HTML
@@ -56,6 +54,8 @@ IDR_SYNC_INTERNALS_SYNC_LOG_JS
IDR_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS
IDR_SYNC_INTERNALS_SYNC_SEARCH_JS
IDR_SYNC_INTERNALS_TRAFFIC_JS
+IDR_TAB_CLOSE_MASK
+IDR_TAB_CLOSE_P
IDR_THROBBER
IDR_UPDATE_BADGE4
IDR_UPDATE_MENU4