diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:15:40 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:15:40 +0000 |
| commit | bf603ea4b8543edbb65a13d60b819b0ac7817ea8 (patch) | |
| tree | 53aeb0223bb2b1535e077bbef6b301051d765359 | |
| parent | 7a60deecea258797c02aa1532eef23ed0e53f778 (diff) | |
| download | chromium_src-bf603ea4b8543edbb65a13d60b819b0ac7817ea8.zip chromium_src-bf603ea4b8543edbb65a13d60b819b0ac7817ea8.tar.gz chromium_src-bf603ea4b8543edbb65a13d60b819b0ac7817ea8.tar.bz2 | |
Aura: Fix popup window frames appearing blue
Added desaturated gray IDR_FRAME, IDR_FRAME_INACTIVE, and IDR_FRAME_APP_PANEL for Aura.
BUG=105883
TEST=visual
Review URL: http://codereview.chromium.org/8748014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112285 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/resources/aura/frame_app_panel_default.png | bin | 0 -> 530 bytes | |||
| -rw-r--r-- | ui/resources/aura/frame_default.png | bin | 0 -> 843 bytes | |||
| -rw-r--r-- | ui/resources/aura/frame_default_inactive.png | bin | 0 -> 655 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 14 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ui/resources/aura/frame_app_panel_default.png b/ui/resources/aura/frame_app_panel_default.png Binary files differnew file mode 100644 index 0000000..aea7e28 --- /dev/null +++ b/ui/resources/aura/frame_app_panel_default.png diff --git a/ui/resources/aura/frame_default.png b/ui/resources/aura/frame_default.png Binary files differnew file mode 100644 index 0000000..06398a3 --- /dev/null +++ b/ui/resources/aura/frame_default.png diff --git a/ui/resources/aura/frame_default_inactive.png b/ui/resources/aura/frame_default_inactive.png Binary files differnew file mode 100644 index 0000000..24937d9 --- /dev/null +++ b/ui/resources/aura/frame_default_inactive.png diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index ac5884c..8763a51 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -35,9 +35,17 @@ <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> - <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" /> + <if expr="pp_ifdef('use_aura')"> + <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. --> + <include name="IDR_FRAME" file="aura/frame_default.png" type="BINDATA" /> + <include name="IDR_FRAME_APP_PANEL" file="aura/frame_app_panel_default.png" type="BINDATA" /> + <include name="IDR_FRAME_INACTIVE" file="aura/frame_default_inactive.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('use_aura')"> + <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" /> + </if> <if expr="pp_ifdef('use_aura')"> <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. --> <include name="IDR_MAXIMIZE" file="aura/maximize.png" type="BINDATA" /> |
