diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 03:23:40 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 03:23:40 +0000 |
| commit | da2b2779e19c981a7b23f6dba17438244713e092 (patch) | |
| tree | 573c25237cd3f344571fba8bb1b7773c2120808d /ui/resources | |
| parent | 03017f7ef58fb13f14492f792f3d122ff7b865fd (diff) | |
| download | chromium_src-da2b2779e19c981a7b23f6dba17438244713e092.zip chromium_src-da2b2779e19c981a7b23f6dba17438244713e092.tar.gz chromium_src-da2b2779e19c981a7b23f6dba17438244713e092.tar.bz2 | |
Aura: Use more traditional window frame, add flag for new look
Added --aura-windows to trigger new-style transparent window frames.
Fixed window frame art for top border.
BUG=102499
TEST=none
Review URL: http://codereview.chromium.org/8423021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
| -rw-r--r-- | ui/resources/ui_resources.grd | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index a8c5916..accdcf1 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -94,14 +94,28 @@ <if expr="pp_ifdef('touchui')"> <include name="IDR_THROBBER" file="large_throbber.png" type="BINDATA" /> </if> - <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> - <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> - <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> + <!-- TODO(jamescook): Delete all these resources when Aura uses its own + transparent window frame. --> + <if expr="pp_ifdef('use_aura')"> + <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner_aura.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner_aura.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('use_aura')"> + <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> + </if> <!-- Images only used by the Views toolkit. --> <if expr="pp_ifdef('toolkit_views')"> |