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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | Download patch
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <include src="../content_security_policy.html"/> 5 <include src="../content_security_policy.html"/>
6 <!-- Set the title to that of the default page so that the title doesn't flash 6 <!-- Set the title to that of the default page so that the title doesn't flash
7 on load (for the most common case). --> 7 on load (for the most common case). -->
8 <title i18n-content="browserPageTabTitle"></title> 8 <title i18n-content="browserPageTabTitle"></title>
9 9
10 <link rel="icon" href="../../../app/theme/settings_favicon.png"> 10 <link rel="icon" href="../../../app/theme/settings_favicon.png">
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 <link rel="stylesheet" href="subpages_tab_controls.css"> 44 <link rel="stylesheet" href="subpages_tab_controls.css">
45 <link rel="stylesheet" href="../sync_setup_overlay.css"> 45 <link rel="stylesheet" href="../sync_setup_overlay.css">
46 <if expr="pp_ifdef('chromeos')"> 46 <if expr="pp_ifdef('chromeos')">
47 <link rel="stylesheet" href="about_page.css"> 47 <link rel="stylesheet" href="about_page.css">
48 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 48 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
49 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 49 <link rel="stylesheet" href="chromeos/change_picture_options.css">
50 <link rel="stylesheet" href="chromeos/internet_options_page.css"> 50 <link rel="stylesheet" href="chromeos/internet_options_page.css">
51 <link rel="stylesheet" href="chromeos/proxy.css"> 51 <link rel="stylesheet" href="chromeos/proxy.css">
52 <link rel="stylesheet" href="chromeos/system_options_page.css"> 52 <link rel="stylesheet" href="chromeos/system_options_page.css">
53 </if> 53 </if>
54 <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')"> 54 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
55 <link rel="stylesheet" href="chromeos/virtual_keyboard.css"> 55 <link rel="stylesheet" href="chromeos/virtual_keyboard.css">
56 </if> 56 </if>
57 57
58 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> 58 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
59 <link rel="stylesheet" href="certificate_manager.css"> 59 <link rel="stylesheet" href="certificate_manager.css">
60 <link rel="stylesheet" href="certificate_tree.css"> 60 <link rel="stylesheet" href="certificate_tree.css">
61 </if> 61 </if>
62 62
63 <script src="chrome://resources/css/tree.css.js"></script> 63 <script src="chrome://resources/css/tree.css.js"></script>
64 64
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 class="subpage-sheet-container transparent" hidden> 158 class="subpage-sheet-container transparent" hidden>
159 <div id="subpage-sheet-2" class="subpage-sheet"> 159 <div id="subpage-sheet-2" class="subpage-sheet">
160 <button class="raw-button close-subpage"></button> 160 <button class="raw-button close-subpage"></button>
161 <div class="subpage-sheet-contents"> 161 <div class="subpage-sheet-contents">
162 <if expr="pp_ifdef('chromeos')"> 162 <if expr="pp_ifdef('chromeos')">
163 <include src="chromeos/language_chewing_options.html"> 163 <include src="chromeos/language_chewing_options.html">
164 <include src="chromeos/language_hangul_options.html"> 164 <include src="chromeos/language_hangul_options.html">
165 <include src="chromeos/language_mozc_options.html"> 165 <include src="chromeos/language_mozc_options.html">
166 <include src="chromeos/language_pinyin_options.html"> 166 <include src="chromeos/language_pinyin_options.html">
167 </if> 167 </if>
168 <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')"> 168 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard') ">
169 <include src="chromeos/virtual_keyboard.html"> 169 <include src="chromeos/virtual_keyboard.html">
170 </if> 170 </if>
171 <include src="cookies_view.html"> 171 <include src="cookies_view.html">
172 <if expr="pp_ifdef('enable_register_protocol_handler')"> 172 <if expr="pp_ifdef('enable_register_protocol_handler')">
173 <include src="handler_options.html"> 173 <include src="handler_options.html">
174 </if> 174 </if>
175 <if expr="pp_ifdef('enable_web_intents')"> 175 <if expr="pp_ifdef('enable_web_intents')">
176 <include src="intents_view.html"> 176 <include src="intents_view.html">
177 </if> 177 </if>
178 <include src="content_settings_exceptions_area.html"> 178 <include src="content_settings_exceptions_area.html">
179 </div> 179 </div>
180 </div> 180 </div>
181 </div> 181 </div>
182 </div> 182 </div>
183 </div> 183 </div>
184 </div> 184 </div>
185 <script src="chrome://settings/strings.js"></script> 185 <script src="chrome://settings/strings.js"></script>
186 <script src="chrome://resources/js/i18n_template.js"></script> 186 <script src="chrome://resources/js/i18n_template.js"></script>
187 <script src="chrome://resources/js/i18n_process.js"></script> 187 <script src="chrome://resources/js/i18n_process.js"></script>
188 </body> 188 </body>
189 </html> 189 </html>
OLDNEW
« 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