Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2644)

Unified Diff: app/resources/app_resources.grd

Issue 1765006: cros: Use Vista-style window decorations. (Closed)
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/app.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resources/app_resources.grd
diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 65ba81cf451bfbdb151652574a35f7e9e901b519..5a8e638d3d4bd34a895dc96d5cb3e427f9a8e448 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')">
Evan Martin 2010/04/27 02:50:42 We really should use toolkit_gtk, but we don't eve
<!-- 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" />
« no previous file with comments | « app/app.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698