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

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

Issue 9386032: [uber page] Migrate the virtual keyboard sub-page to a dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: var rename Created 8 years, 10 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 | « chrome/browser/resources/options2/language_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/options.html
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 80df8552e2819ee47dcf248d2c2825175790137b..c64239f5ce227dca7cebc80b108fbb1fada2b488 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -117,6 +117,9 @@
<include src="chromeos/language_mozc_options.html">
<include src="chromeos/language_pinyin_options.html">
</if>
+ <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
+ <include src="chromeos/virtual_keyboard.html">
+ </if>
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
<include src="certificate_restore_overlay.html">
<include src="certificate_backup_overlay.html">
@@ -161,9 +164,6 @@
<div id="subpage-sheet-3" class="subpage-sheet">
<button class="raw-button close-subpage custom-appearance"></button>
<div class="subpage-sheet-contents">
- <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
- <include src="chromeos/virtual_keyboard.html">
- </if>
<include src="cookies_view.html">
<if expr="pp_ifdef('enable_register_protocol_handler')">
<include src="handler_options.html">
« no previous file with comments | « chrome/browser/resources/options2/language_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698