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

Unified Diff: chrome/browser/resources/options/options.html

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased on ToT, fix along with review comments Created 9 years, 2 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
Index: chrome/browser/resources/options/options.html
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index f7cc0c32c4ca6d2d4a68f27bb77d407a0c740ce4..61b7243bab738c12a0bb0d475d55b47836b7c7b7 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -51,7 +51,7 @@
<link rel="stylesheet" href="chromeos/proxy.css">
<link rel="stylesheet" href="chromeos/system_options_page.css">
</if>
-<if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
+<if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
<link rel="stylesheet" href="chromeos/virtual_keyboard.css">
</if>
@@ -165,7 +165,7 @@
<include src="chromeos/language_mozc_options.html">
<include src="chromeos/language_pinyin_options.html">
</if>
- <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
+ <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
<include src="chromeos/virtual_keyboard.html">
</if>
<include src="cookies_view.html">
« no previous file with comments | « chrome/browser/resources/options/language_options.html ('k') | chrome/browser/ui/touch/frame/touch_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698