Refactor chrome://flags template to remove localised strings
The strings on the chrome://flags don't need localisation so we can
remove them from the grdp file and just have the strings in
the template itself.
Bug:
Change-Id: Idcd70404c37762f0a12334116a6b86941347f813
Reviewed-on: https://chromium-review.googlesource.com/854837
Reviewed-by: Eugene But <[email protected]>
Reviewed-by: Sylvain Defresne <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Commit-Queue: Edward Jung <[email protected]>
Cr-Commit-Position: refs/heads/master@{#528992}diff --git a/components/flags_ui/flags_ui_constants.cc b/components/flags_ui/flags_ui_constants.cc
index 6168af4..2b902245b 100644
--- a/components/flags_ui/flags_ui_constants.cc
+++ b/components/flags_ui/flags_ui_constants.cc
@@ -16,24 +16,10 @@
const char kRestartBrowser[] = "restartBrowser";
// Other values.
-const char kChannelPromoBeta[] = "channelPromoBeta";
-const char kChannelPromoDev[] = "channelPromoDev";
-const char kDisable[] = "disable";
-const char kEnable[] = "enable";
-const char kFlagsBlurb[] = "flagsBlurb";
-const char kFlagsTitle[] = "flagsTitle";
-const char kFlagsNoExperimentsAvailable[] = "flagsNoExperimentsAvailable";
-const char kFlagsNoMatches[] = "flagsNoMatches";
-const char kFlagsNotSupported[] = "flagsNotSupported";
const char kFlagsRestartButton[] = "flagsRestartButton";
const char kFlagsRestartNotice[] = "flagsRestartNotice";
-const char kFlagsSearchPlaceholder[] = "flagsSearchPlaceholder";
-const char kFlagsSupportedTitle[] = "flagsSupportedTitle";
-const char kFlagsUnsupportedTitle[] = "flagsUnsupportedTitle";
-const char kFlagsWarningHeader[] = "flagsWarningHeader";
const char kNeedsRestart[] = "needsRestart";
-const char kOwnerWarning[] = "ownerWarning";
-const char kResetAllButton[] = "resetAllButton";
+const char kOwnerEmail[] = "ownerEmail";
const char kReturnExperimentalFeatures[] = "returnExperimentalFeatures";
const char kShowBetaChannelPromotion[] = "showBetaChannelPromotion";
const char kShowDevChannelPromotion[] = "showDevChannelPromotion";
diff --git a/components/flags_ui/flags_ui_constants.h b/components/flags_ui/flags_ui_constants.h
index ce879b3a..67442bc 100644
--- a/components/flags_ui/flags_ui_constants.h
+++ b/components/flags_ui/flags_ui_constants.h
@@ -20,24 +20,10 @@
// Other values.
// Must match the constants used in the resource files.
-extern const char kChannelPromoBeta[];
-extern const char kChannelPromoDev[];
-extern const char kDisable[];
-extern const char kEnable[];
-extern const char kFlagsBlurb[];
-extern const char kFlagsTitle[];
-extern const char kFlagsNoExperimentsAvailable[];
-extern const char kFlagsNoMatches[];
-extern const char kFlagsNotSupported[];
extern const char kFlagsRestartButton[];
extern const char kFlagsRestartNotice[];
-extern const char kFlagsSearchPlaceholder[];
-extern const char kFlagsSupportedTitle[];
-extern const char kFlagsUnsupportedTitle[];
-extern const char kFlagsWarningHeader[];
extern const char kNeedsRestart[];
-extern const char kOwnerWarning[];
-extern const char kResetAllButton[];
+extern const char kOwnerEmail[];
extern const char kReturnExperimentalFeatures[];
extern const char kShowBetaChannelPromotion[];
extern const char kShowDevChannelPromotion[];
diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/resources/flags.html
index cf3e062b..b19625a6 100644
--- a/components/flags_ui/resources/flags.html
+++ b/components/flags_ui/resources/flags.html
@@ -1,5 +1,5 @@
<!doctype html>
-<html dir="$i18n{textdirection}" lang="$i18n{language}">
+<html dir="ltr" lang="en">
<head>
<meta charset="utf-8">
<if expr="not is_ios">
@@ -23,33 +23,47 @@
<div class="flex-container">
<div class="flex">
<div class="search-container">
- <input type="text" id="search" placeholder="$i18n{flagsSearchPlaceholder}" tabindex="1">
+ <input type="text" id="search" placeholder="Search flags" tabindex="1">
<button class="clear-search" title="Clear search" tabindex="2"></button>
</div>
</div>
<div class="flex">
- <button id="experiment-reset-all" type="button" tabindex="3">$i18n{resetAllButton}</button>
+ <button id="experiment-reset-all" type="button" tabindex="3">
+ Reset all to default
+ </button>
</div>
</div>
</div>
<div id="body-container" style="visibility:hidden">
<div id="flagsTemplate">
<div class="flex-container">
- <div class="flex"><h2 class="section-header-title">$i18n{flagsTitle}</h2></div>
+ <div class="flex"><h2 class="section-header-title">Experiments</h2></div>
<span id="version" class="flex">$i18n{version}</span>
</div>
<div class="blurb-container">
- <span class="blurb-warning">$i18n{flagsWarningHeader}</span>
- <span>$i18n{flagsBlurb}</span>
+ <span class="blurb-warning">
+ Warning: Experimental features ahead!
+ </span>
+ <span>
+ By enabling these features, you could lose browser data or
+ compromise your security or privacy. Enabled features apply to all
+ users of this browser.
+ </span>
<if expr="chromeos">
<p id="owner-warning">
- <span>$i18n{ownerWarning}</span>
+ <span>Flags that apply system-wide can only be set by the owner: $i18n{ownerEmail}</span>
</p>
</if>
</div>
<p class="promo">
- <span id="channel-promo-beta" hidden>$i18nRaw{channelPromoBeta}</span>
- <span id="channel-promo-dev" hidden>$i18nRaw{channelPromoDev}</span>
+ <span id="channel-promo-beta" hidden>
+ Interested in cool new Chrome features? Try our
+ <a href="https://chrome.com/beta">beta channel</a>.
+ </span>
+ <span id="channel-promo-dev" hidden>
+ Interested in cool new Chrome features? Try our
+ <a href="https://chrome.com/dev">dev channel</a>
+ </span>
</p>
<ul class="tabs" role="tablist">
<li class="selected">
@@ -137,7 +151,7 @@
</div>
</div>
</div>
- <div class="no-match hidden">$i18n{flagsNoMatches}</div>
+ <div class="no-match hidden">No matching experiments</div>
</div>
</li>
<!-- Unsupported experiments are not shown on iOS -->
@@ -165,10 +179,12 @@
jsvalues="href: '#' + internal_name"
jscontent="'#' + internal_name" tabindex="7"></a>
</div>
- <div class="flex experiment-actions">$i18n{flagsNotSupported}</div>
+ <div class="flex experiment-actions">Not available on your platform.</div>
</div>
</div>
- <div class="no-match hidden">$i18n{flagsNoMatches}</div>
+ <div class="no-match hidden">
+ No matching experiments
+ </div>
</div>
</li>
</if>
@@ -179,7 +195,12 @@
<div class="flex">
<if expr="not is_ios">
<button class="experiment-restart-button" type="button" tabindex="8">
- $i18n{flagsRestartButton}
+<if expr="not is_chromeos">
+ Relaunch Now
+</if>
+<if expr="is_chromeos">
+ Restart Now
+</if>
</button>
</if>
</div>
