diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 06:50:53 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 06:50:53 +0000 |
| commit | 39665cbfc8663c5f236918a0b559cbf966bb1bc1 (patch) | |
| tree | 5a3c7b742a9e46f628ed2b72d5b61860045fd7e3 /chrome/app | |
| parent | 9f324fb0a73bbe316aaf9c97895c7cac1613abfe (diff) | |
| download | chromium_src-39665cbfc8663c5f236918a0b559cbf966bb1bc1.zip chromium_src-39665cbfc8663c5f236918a0b559cbf966bb1bc1.tar.gz chromium_src-39665cbfc8663c5f236918a0b559cbf966bb1bc1.tar.bz2 | |
fix content_center_top
TBR=benrg@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10783011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 25 | ||||
| -rw-r--r-- | chrome/app/theme/touch_100_percent/content_top_center.png | bin | 2819 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/touch_100_percent/content_top_center_ash.png | bin | 2810 -> 0 bytes |
3 files changed, 6 insertions, 19 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index d1a23d5..8cbd420 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -96,26 +96,13 @@ <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" /> <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" /> <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" /> - <!-- TODO(benrg): Get rid of all conditionals that test the output - context. --> - <if expr="context.startswith('default_')"> - <!-- Ash doesn't draw rounded content area, so needs a special top - image. --> - <if expr="not pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" /> - </if> - <if expr="pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" /> - </if> + <!-- Ash doesn't draw rounded content area, so needs a special top + image. --> + <if expr="not pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" /> </if> - <if expr="not context.startswith('default_')"> - <!-- TODO(benrg): This is obviously wrong; fix it. --> - <if expr="not pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" /> - </if> - <if expr="pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center_ash.png" /> - </if> + <if expr="pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" /> </if> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" /> <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" /> diff --git a/chrome/app/theme/touch_100_percent/content_top_center.png b/chrome/app/theme/touch_100_percent/content_top_center.png Binary files differdeleted file mode 100644 index 695af4a..0000000 --- a/chrome/app/theme/touch_100_percent/content_top_center.png +++ /dev/null diff --git a/chrome/app/theme/touch_100_percent/content_top_center_ash.png b/chrome/app/theme/touch_100_percent/content_top_center_ash.png Binary files differdeleted file mode 100644 index 4c1ef01..0000000 --- a/chrome/app/theme/touch_100_percent/content_top_center_ash.png +++ /dev/null |
