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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/flags_ui/resources/apple_flags.html

Issue 1500533002: Upstream chrome://flags & chrome://ui-alternatives iOS WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add components/flags_ui/resources/apple_flags.css to PRESUBMIT blacklist Created 5 years 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 | « components/flags_ui/resources/apple_flags.css ('k') | components/flags_ui_strings.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/flags_ui/resources/apple_flags.html
diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/resources/apple_flags.html
similarity index 51%
copy from components/flags_ui/resources/flags.html
copy to components/flags_ui/resources/apple_flags.html
index b29c25ad412395197fe9cb82ed8d09830321d401..5b34466ba15d3ab5b4816a6c702ae1016eb97c94 100644
--- a/components/flags_ui/resources/flags.html
+++ b/components/flags_ui/resources/apple_flags.html
@@ -1,43 +1,21 @@
-<!doctype html>
-<html i18n-values="dir:textdirection;lang:language">
+<!DOCTYPE HTML>
+<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
<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">
-
+<link rel="stylesheet" href="apple_flags.css">
<if expr="is_ios">
-<!-- TODO(crbug.com/487000): Remove this once injected by web. -->
<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>
-<script src="chrome://flags/strings.js"></script>
+<script src="chrome://ui-alternatives/flags.js"></script>
+<script src="chrome://ui-alternatives/strings.js"></script>
</head>
-<body>
+<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id="body-container" style="visibility:hidden">
-
- <div id="header">
- <div id="title-spacer"><h1 i18n-content="flagsLongTitle"></h1></div>
- </div>
-
- <div class="blurb-container">
- <span id="blurb-warning" i18n-content="flagsWarningHeader">WARNING</span>
- <span i18n-content="flagsBlurb">WARNING TEXT</span>
- <span id="channel-promo-beta" i18n-content="channelPromoBeta" hidden></span>
- <span id="channel-promo-dev" i18n-content="channelPromoDev" hidden></span>
- </div>
-
-<if expr="chromeos">
- <div class="blurb-container" id="owner-warning">
- <span i18n-content="ownerWarning"></span>
- </div>
-</if>
-
<div id="flagsTemplate">
<div id="container" class="vbox-container">
<div id="top" class="wbox">
@@ -46,7 +24,8 @@
<td>
<span class="section-header-title" i18n-content="flagsTableTitle"
>TITLE</span>
- <button id="experiment-reset-all" type="button"
+ <button id="experiment-reset-all"
+ jsdisplay="supportedFeatures.length > 0" type="button"
i18n-content="resetAllButton"></button>
</td>
</tr></table>
@@ -55,14 +34,21 @@
</div>
<div class="content">
+ <div class="experiment-name no-experiments"
+ jsdisplay="supportedFeatures.length == 0">
+ <div i18n-content="flagsNoExperimentsAvailable"
+ >NO_EXPERIMENTS_ARE_AVAILABLE</div>
+ </div>
+
+ <div jsdisplay="supportedFeatures.length > 0">
<div class="experiment"
jsselect="supportedFeatures"
jsvalues="id:internal_name">
<table width="100%" cellpadding="2" cellspacing="0">
<!-- TODO(mkwst): This doesn't work exactly as expected for multivalue
experiments. See http://crbug.com/73730 -->
- <tr jsvalues="class: is_default ? 'experiment-default'
- : 'experiment-switched'">
+ <tr jsvalues="class: enabled ? 'experiment-enabled'
+ : 'experiment-disabled'">
<td valign="top">
<div class="experiment-text">
<div>
@@ -109,59 +95,12 @@
</tr>
</table>
</div>
+ </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">
- <table cellpadding="0" cellspacing="0"><tr valign="center">
- <td>
- <span class="section-header-title"
- i18n-content="flagsUnsupportedTableTitle"
- >TITLE
- </span>
- </td>
- </tr></table>
- </div>
- </div>
- </div>
-
- <div class="content">
- <div class="experiment"
- jsselect="unsupportedFeatures"
- jsvalues="id:internal_name">
- <table width="100%" cellpadding="2" cellspacing="0">
- <tr class="experiment-unsupported">
- <td valign="top">
- <div class="experiment-text">
- <div>
- <span class="experiment-name"
- jscontent="name">NAME</span>
- <span jscontent="supported_platforms.join(', ')"></span>
- <div>
- <span jsvalues=".innerHTML:description"></span>
- <a class="permalink"
- jsvalues="href: '#' + internal_name"
- jscontent="'#' + internal_name"></a>
- </div>
- </div>
- </div>
- <div class="experiment-actions">
- <div i18n-content="flagsNotSupported"></div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- </div>
-</if>
-
- <div class="needs-restart" jsdisplay="needsRestart">
- <div i18n-content="flagsRestartNotice">NEEDS_RESTART</div>
- <button class="experiment-restart-button" type="button"
- i18n-content="flagsRestartButton">RESTART</button>
+ <div class="needs-restart"
+ jsdisplay="supportedFeatures.length > 0">
+ <div i18n-content="flagsRestartNotice">NEEDS_RESTART</div>
</div>
</div>
</div>
« no previous file with comments | « components/flags_ui/resources/apple_flags.css ('k') | components/flags_ui_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698