diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 19:27:58 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 19:27:58 +0000 |
| commit | 32d2853fe030d0e626585e64d13c8c8b7341956b (patch) | |
| tree | 7b8ba930bb601c2cf1f6fef2b9aa660b241729fb /chrome | |
| parent | 25b435cce0ef1ed743f2dfc4438c6c3a7f357336 (diff) | |
| download | chromium_src-32d2853fe030d0e626585e64d13c8c8b7341956b.zip chromium_src-32d2853fe030d0e626585e64d13c8c8b7341956b.tar.gz chromium_src-32d2853fe030d0e626585e64d13c8c8b7341956b.tar.bz2 | |
GTK: Exclude gtk-theme mode specific images from the other platforms.
BUG=46111
TEST=none
Review URL: http://codereview.chromium.org/2785001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index de2ffb7..c6c952d 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -46,13 +46,9 @@ <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="omnibox_ev_bubble_background_r.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HISTORY" file="omnibox_history.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HISTORY_DARK" file="omnibox_history_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HISTORY_TRANSPARENT" file="omnibox_history_transparent.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT" file="omnibox_history_dark_transparent.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HISTORY_SELECTED" file="omnibox_history_selected.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HTTP" file="omnibox_http.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HTTP_DARK" file="omnibox_http_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTP_TRANSPARENT" file="omnibox_http_transparent.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTP_DARK_TRANSPARENT" file="omnibox_http_dark_transparent.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HTTP_SELECTED" file="omnibox_http_selected.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox_https_invalid.png" type="BINDATA" /> <include name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox_https_valid.png" type="BINDATA" /> @@ -531,6 +527,14 @@ <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <!-- The GTK interface needs these slightly modified images in + gtk-theme mode. Other platforms don't need these. --> + <include name="IDR_OMNIBOX_HISTORY_TRANSPARENT" file="omnibox_history_transparent.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT" file="omnibox_history_dark_transparent.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTP_TRANSPARENT" file="omnibox_http_transparent.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTP_DARK_TRANSPARENT" file="omnibox_http_dark_transparent.png" type="BINDATA" /> + </if> </includes> </release> </grit> |