summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authormsw@google.com <msw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 19:58:13 +0000
committermsw@google.com <msw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 19:58:13 +0000
commitfbd916df878602f5f550100ec4dc21eeaf7ae5a4 (patch)
tree2e30ab63fdb4d2c0d8ce2f53e2c768297bf55288 /ui/resources
parent9424bf82d3ed3ae17eeb752d84d420f4ada06eee (diff)
downloadchromium_src-fbd916df878602f5f550100ec4dc21eeaf7ae5a4.zip
chromium_src-fbd916df878602f5f550100ec4dc21eeaf7ae5a4.tar.gz
chromium_src-fbd916df878602f5f550100ec4dc21eeaf7ae5a4.tar.bz2
Copy chrome/app/theme (x) close images to ui/resources.
Add ui/resources/default_[1|2]00_percent/close_dialog*.png (copied from chrome/app/theme/default_[1|2]00_percent/web_ui_close*.png) (these are the most up-to-date image that we want to use) Add IDR_CLOSE_DIALOG[_H|_P] to ui_resources.grd TODO(followup): Remove IDR_WEB_UI_CLOSE* and images, use IDR_CLOSE_DIALOG*. (that will depend on WIP CL https://codereview.chromium.org/11830002) BUG=166075 TEST=NONE R=sky@chromium.org Review URL: https://codereview.chromium.org/11785037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/default_100_percent/close_dialog.pngbin0 -> 155 bytes
-rw-r--r--ui/resources/default_100_percent/close_dialog_hover.pngbin0 -> 240 bytes
-rw-r--r--ui/resources/default_100_percent/close_dialog_pressed.pngbin0 -> 239 bytes
-rw-r--r--ui/resources/default_200_percent/close_dialog.pngbin0 -> 205 bytes
-rw-r--r--ui/resources/default_200_percent/close_dialog_hover.pngbin0 -> 488 bytes
-rw-r--r--ui/resources/default_200_percent/close_dialog_pressed.pngbin0 -> 493 bytes
-rw-r--r--ui/resources/ui_resources.grd3
7 files changed, 3 insertions, 0 deletions
diff --git a/ui/resources/default_100_percent/close_dialog.png b/ui/resources/default_100_percent/close_dialog.png
new file mode 100644
index 0000000..31317fc
--- /dev/null
+++ b/ui/resources/default_100_percent/close_dialog.png
Binary files differ
diff --git a/ui/resources/default_100_percent/close_dialog_hover.png b/ui/resources/default_100_percent/close_dialog_hover.png
new file mode 100644
index 0000000..ee6800c
--- /dev/null
+++ b/ui/resources/default_100_percent/close_dialog_hover.png
Binary files differ
diff --git a/ui/resources/default_100_percent/close_dialog_pressed.png b/ui/resources/default_100_percent/close_dialog_pressed.png
new file mode 100644
index 0000000..db97dca
--- /dev/null
+++ b/ui/resources/default_100_percent/close_dialog_pressed.png
Binary files differ
diff --git a/ui/resources/default_200_percent/close_dialog.png b/ui/resources/default_200_percent/close_dialog.png
new file mode 100644
index 0000000..fa8e296
--- /dev/null
+++ b/ui/resources/default_200_percent/close_dialog.png
Binary files differ
diff --git a/ui/resources/default_200_percent/close_dialog_hover.png b/ui/resources/default_200_percent/close_dialog_hover.png
new file mode 100644
index 0000000..7d8e18a
--- /dev/null
+++ b/ui/resources/default_200_percent/close_dialog_hover.png
Binary files differ
diff --git a/ui/resources/default_200_percent/close_dialog_pressed.png b/ui/resources/default_200_percent/close_dialog_pressed.png
new file mode 100644
index 0000000..f9817fa
--- /dev/null
+++ b/ui/resources/default_200_percent/close_dialog_pressed.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 527dce5..8a1b8eb 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -92,6 +92,9 @@
<structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" />
<structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" />
<structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_dialog.png" />
+ <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="close_dialog_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="close_dialog_pressed.png" />
<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux_close_hover.png" />
<structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux_close_pressed.png" />