diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:22:27 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:22:27 +0000 |
| commit | 9bb75ccc56cdb94a9778dcef26be3de97808f3ce (patch) | |
| tree | 545e23044e99bf525d071b8c1cda1f2c19f0b626 /app | |
| parent | 4d44a1c2af8fc76d1d9790740bd4ac8fe5fe5bfe (diff) | |
| download | chromium_src-9bb75ccc56cdb94a9778dcef26be3de97808f3ce.zip chromium_src-9bb75ccc56cdb94a9778dcef26be3de97808f3ce.tar.gz chromium_src-9bb75ccc56cdb94a9778dcef26be3de97808f3ce.tar.bz2 | |
cros: Use Vista-style window decorations.
We were previously using the Linux version's images but
drawing them in the position needed by the Views images.
BUG=40474
TEST=built the chrome os version
Review URL: http://codereview.chromium.org/1765006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.gyp | 5 | ||||
| -rw-r--r-- | app/resources/app_resources.grd | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/app.gyp b/app/app.gyp index adc1f76..f03cc0a 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -143,6 +143,11 @@ 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)/app_resources'], + 'conditions': [ + ['toolkit_views==1', { + 'action': ['-D', 'toolkit_views'], + }], + ], 'message': 'Generating resources from <(input_path)', }, ], diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd index 65ba81c..5a8e638 100644 --- a/app/resources/app_resources.grd +++ b/app/resources/app_resources.grd @@ -12,8 +12,8 @@ <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> - <if expr="os == 'win32'"> - <!-- Window controls for Windows, in the style of Vista --> + <if expr="pp_ifdef('toolkit_views')"> + <!-- Window controls for Windows and Chrome OS, in the style of Vista --> <include name="IDR_CLOSE" file="close.png" type="BINDATA" /> <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" /> <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" /> @@ -31,7 +31,7 @@ <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" /> </if> - <if expr="os == 'linux2' or os == 'freebsd7' or os == 'openbsd4'"> + <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os == 'freebsd7' or os == 'openbsd4')"> <!-- Window controls for Linux/BSD, in the style of Metacity --> <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" /> <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" /> |