summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 03:00:35 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 03:00:35 +0000
commitf27bb9a6ab467be9588a382643d730c86732a1d1 (patch)
treeaa29c61a8b6374cc702688b5cd2dcee526730ad6 /chrome/browser/resources
parentc00a3e652c20228ecc1aad3627700353c635d4e4 (diff)
downloadchromium_src-f27bb9a6ab467be9588a382643d730c86732a1d1.zip
chromium_src-f27bb9a6ab467be9588a382643d730c86732a1d1.tar.gz
chromium_src-f27bb9a6ab467be9588a382643d730c86732a1d1.tar.bz2
Revert 53126 - Fix compile on Linus Views
BUG=none TBR=sargrass TEST=bots go green Review URL: http://codereview.chromium.org/3012014 TBR=csilv@chromium.org Review URL: http://codereview.chromium.org/3015013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/options/personal_options.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index fdf403f..95c5a8d 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -98,7 +98,7 @@
</table>
</section>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
+ <if expr="(os == 'linux2' or os.find('bsd') != -1) and not pp_ifdef('chromeos')">
<section>
<h3 i18n-content="appearance"></h3>
<table class="option-control-table">
@@ -130,7 +130,7 @@
</table>
</section>
</if>
- <if expr="pp_ifdef('toolkit_views') or os == 'win32' or os == 'darwin'">
+ <if expr="pp_ifdef('chromeos') or os == 'win32' or os == 'darwin'">
<section>
<h3 i18n-content="themes"></h3>
<table class="option-control-table">