summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 19:06:41 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 19:06:41 +0000
commitf3e20fb203bc10e7c7d03ce5550a20371fd38872 (patch)
treeeb057754ca12692b98cd794a0d5a4e00108bedf2 /ui/resources
parent39ce1e5eaef998987ff36afc48cebeed516c41b2 (diff)
downloadchromium_src-f3e20fb203bc10e7c7d03ce5550a20371fd38872.zip
chromium_src-f3e20fb203bc10e7c7d03ce5550a20371fd38872.tar.gz
chromium_src-f3e20fb203bc10e7c7d03ce5550a20371fd38872.tar.bz2
Redesignate checkmark resource and add themed IDR_INPUT_GOOD image
The resources IDR_INPUT_ALERT and IDR_INPUT_GOOD are used in tandem. This CL makes them both part of the theme resources. Furthermore, the IDR_INPUT_GOOD image is used by the checkmark throbber as a checkmark. It is simply renamed to be as such. This work is done in anticipation of using IDR_INPUT_ALRT and IDR_INPUT_GOOD in tandem as part of changing the edit search engine dialog to Web UI. BUG=None TEST=None Review URL: http://codereview.chromium.org/8044019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/checkmark.png (renamed from ui/resources/input_good.png)bin1042 -> 1042 bytes
-rw-r--r--ui/resources/ui_resources.grd6
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/resources/input_good.png b/ui/resources/checkmark.png
index 1646cd5..1646cd5 100644
--- a/ui/resources/input_good.png
+++ b/ui/resources/checkmark.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 3902ea3..b002807 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -13,6 +13,7 @@
<include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" />
<include name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" type="BINDATA" />
<include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" />
+ <include name="IDR_CHECKMARK" file="checkmark.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
<include name="IDR_CLOSE" file="close.png" type="BINDATA" />
<include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
@@ -42,7 +43,6 @@
<include name="IDR_FRAME" file="frame_default.png" type="BINDATA" />
<include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" />
<include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" />
- <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
<include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
<include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
@@ -118,7 +118,7 @@
<include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" />
<include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" />
</if>
-
+
<!-- Images only used by Aura. -->
<if expr="pp_ifdef('use_aura')">
<include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-48.png" type="BINDATA" />
@@ -127,7 +127,7 @@
<include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" />
<include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
<include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
- </if>
+ </if>
</includes>
</release>
</grit>