[iOS] Upstream tweaks to flags.html

This CL upstreams the changes to flags.html that are used on iOS: - Temporary inclusion of web_ui.js so that the page works on iOS - Do not display the unsupported experiments on iOS (because they are almost all unsupported) Review URL: https://codereview.chromium.org/1390793003 Cr-Commit-Position: refs/heads/master@{#352806}
FairyWorld · Oct 7, 2015 · 04c9409 · 04c9409
1 parent c753691
commit 04c9409
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/resources/flags.html
@@ -2,11 +2,18 @@
 <html i18n-values="dir:textdirection;lang:language">
 <head>
 <meta charset="utf-8">
-<if expr="is_android">
+<if expr="is_android or is_ios">
 <meta name="viewport" content="width=device-width, user-scalable=no">
 </if>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 <link rel="stylesheet" href="flags.css">
+
+<if expr="is_ios">
+<!-- TODO(jyquinn): Remove this once CRWWebUIPageBuilder can inject it.
+     See http://crbug.com/487000 -->
+<script src="chrome://resources/js/ios/web_ui.js"></script>
+</if>
+
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>
 <script src="chrome://flags/flags.js"></script>
@@ -113,6 +120,8 @@
       </div>
     </div>
 
+<!-- Unsupported experiments are not shown on iOS -->
+<if expr="not is_ios">
     <div id="container" class="vbox-container">
     <div id="top" class="wbox">
       <div class="section-header">
@@ -164,6 +173,7 @@
       </div>
       </div>
     </div>
+</if>
 
     <div class="needs-restart" jsdisplay="needsRestart">
       <div i18n-content="flagsRestartNotice">NEEDS_RESTART</div>