Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit 5a4ccee

Browse files
jamCommit bot
jam
authored and
Commit bot
committed
Revert of Fix some more for= usage. (patchset #7 id:120001 of https://codereview.chromium.org/539383003/)
Reason for revert: breaks linux_chromeos on try runs here and on buildbot Original issue's description: > Fix some more for= usage. > > Also fix some controlled settings indicators. > > BUG=409938 > [email protected] > > Committed: https://crrev.com/ce80b519af00bb6259e8c63f91fee5263d818124 > Cr-Commit-Position: refs/heads/master@{#294681} [email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=409938 Review URL: https://codereview.chromium.org/562023003 Cr-Commit-Position: refs/heads/master@{#294765}
1 parent af71ddc commit 5a4ccee

13 files changed

+272
-355
lines changed

‎chrome/browser/resources/options/browser_options.html

Lines changed: 100 additions & 142 deletions
Large diffs are not rendered by default.

‎chrome/browser/resources/options/content_settings.html

Lines changed: 78 additions & 125 deletions
Large diffs are not rendered by default.

‎chrome/browser/resources/options/controlled_setting.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,29 @@
44

55
/* Controlled setting indicator and bubble. */
66

7+
.controlled-setting-with-label {
8+
-webkit-box-align: center;
9+
display: -webkit-box;
10+
padding-bottom: 7px;
11+
padding-top: 7px;
12+
}
13+
714
.controlled-setting-with-label input + span {
815
-webkit-box-align: center;
916
-webkit-box-flex: 1;
1017
-webkit-margin-start: 0.6em;
1118
display: -webkit-box;
1219
}
1320

14-
.controlled-setting-with-label input:disabled + span {
21+
.controlled-setting-with-label input:disabled + span label {
1522
color: #999;
1623
}
1724

25+
.controlled-setting-with-label label {
26+
display: inline;
27+
padding: 0;
28+
}
29+
1830
.controlled-setting-indicator:not([controlled-by]) {
1931
display: none;
2032
}

‎chrome/browser/resources/options/home_page_overlay.html

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,42 @@
22
<div class="close-button"></div>
33
<h1 i18n-content="homePageOverlay"></h1>
44
<div class="content-area">
5-
<div class="radio controlled-setting-with-label">
6-
<label>
5+
<div class="radio">
6+
<span class="controlled-setting-with-label">
77
<input id="homepage-use-ntp" type="radio" name="homepage"
88
pref="homepage_is_newtabpage" value="true"
99
metric="Options_Homepage_IsNewTabPage" dialog-pref>
1010
<span>
11-
<span i18n-content="homePageUseNewTab"></span>
11+
<label for="homepage-use-ntp" i18n-content="homePageUseNewTab">
12+
</label>
1213
<span class="controlled-setting-indicator"
13-
pref="homepage_is_newtabpage" value="true" dialog-pref></span>
14+
pref="homepage_is_newtabpage" value="true" dialog-pref>
15+
</span>
1416
</span>
15-
</label>
17+
</span>
1618
</div>
17-
<div class="radio controlled-setting-with-label">
18-
<label>
19+
<div class="radio">
20+
<span class="controlled-setting-with-label">
1921
<input id="homepage-use-url" type="radio" name="homepage"
2022
pref="homepage_is_newtabpage" value="false"
2123
metric="Options_Homepage_IsNewTabPage" dialog-pref>
2224
<span>
23-
<span id="homepage-use-url-label" i18n-content="homePageUseURL">
24-
</span>
25+
<label id="homepage-use-url-label" i18n-content="homePageUseURL"
26+
for="homepage-use-url">
27+
</label>
2528
<span class="controlled-setting-indicator"
26-
pref="homepage_is_newtabpage" value="false" dialog-pref></span>
29+
pref="homepage_is_newtabpage" value="false" dialog-pref>
30+
</span>
31+
<input id="homepage-url-field" type="url" data-type="url"
32+
class="weakrtl favicon-cell stretch" pref="homepage"
33+
aria-labelledby="homepage-use-url-label"
34+
metric="Options_Homepage_URL" dialog-pref>
35+
</input>
36+
<span id="homepage-url-field-indicator"
37+
class="controlled-setting-indicator" pref="homepage"
38+
dialog-pref>
39+
</span>
2740
</span>
28-
</label>
29-
<input id="homepage-url-field" type="url" data-type="url"
30-
class="weakrtl favicon-cell stretch" pref="homepage"
31-
aria-labelledby="homepage-use-url-label"
32-
metric="Options_Homepage_URL" dialog-pref>
33-
</input>
34-
<span id="homepage-url-field-indicator"
35-
class="controlled-setting-indicator" pref="homepage"
36-
dialog-pref>
3741
</span>
3842
</div>
3943
</div>

‎chrome/browser/resources/options/hotword_confirm_overlay.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ <h1 i18n-content="hotwordConfirmOverlay"></h1>
2323
</div>
2424
</div>
2525
<div id="audio-logging-bar" class="gray-bottom-bar checkbox">
26-
<label>
27-
<input
26+
<span class="controlled-setting-with-label">
27+
<input id="hotword-audio-logging-enable"
2828
pref="hotword.audio_logging_enabled"
2929
metric="Options_Hotword_AudioLogging_Checkbox"
3030
type="checkbox" dialog-pref checked>
31-
<span i18n-content="hotwordAudioLoggingEnable"></span>
32-
</label>
31+
<span>
32+
<label for="hotword-audio-logging-enable"
33+
i18n-content="hotwordAudioLoggingEnable">
34+
</label>
35+
</span>
36+
</span>
3337
</div>
3438
</div>

‎chrome/browser/resources/options/import_data_overlay.html

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,40 @@ <h1 i18n-content="importDataOverlay"></h1>
1515
id="import-history-with-label">
1616
<label>
1717
<input id="import-history" type="checkbox" pref="import_history">
18-
<span>
19-
<span i18n-content="importHistory"></span>
20-
<span class="controlled-setting-indicator" pref="import_history">
21-
</span>
22-
</span>
18+
<span i18n-content="importHistory"></span>
2319
</label>
20+
<span class="controlled-setting-indicator" pref="import_history">
21+
</span>
2422
</div>
2523
<div class="checkbox controlled-setting-with-label"
2624
id="import-favorites-with-label">
2725
<label>
2826
<input id="import-favorites" type="checkbox"
2927
pref="import_bookmarks">
30-
<span>
31-
<span i18n-content="importFavorites"></span>
32-
<span class="controlled-setting-indicator"
33-
pref="import_bookmarks"></span>
34-
</span>
28+
<span i18n-content="importFavorites"></span>
3529
</label>
30+
<span class="controlled-setting-indicator"
31+
pref="import_bookmarks"></span>
3632
</div>
3733
<div class="checkbox controlled-setting-with-label"
3834
id="import-passwords-with-label">
3935
<label>
4036
<input id="import-passwords" type="checkbox"
4137
pref="import_saved_passwords">
42-
<span>
43-
<span i18n-content="importPasswords"></span>
44-
<span class="controlled-setting-indicator"
45-
pref="import_saved_passwords"></span>
46-
</span>
38+
<span i18n-content="importPasswords"></span>
4739
</label>
40+
<span class="controlled-setting-indicator"
41+
pref="import_saved_passwords"></span>
4842
</div>
4943
<div class="checkbox controlled-setting-with-label"
5044
id="import-search-with-label">
5145
<label>
5246
<input id="import-search" type="checkbox"
5347
pref="import_search_engine">
54-
<span>
55-
<span i18n-content="importSearch"></span>
56-
<span class="controlled-setting-indicator"
57-
pref="import_search_engine"></span>
58-
</span>
48+
<span i18n-content="importSearch"></span>
5949
</label>
50+
<span class="controlled-setting-indicator"
51+
pref="import_search_engine"></span>
6052
</div>
6153
<div class="checkbox controlled-setting-with-label"
6254
id="import-autofill-form-data-with-label">
@@ -84,12 +76,10 @@ <h1 i18n-content="importDataOverlay"></h1>
8476
<input id="import-data-show-bookmarks-bar"
8577
pref="bookmark_bar.show_on_all_tabs"
8678
metric="Options_ShowBookmarksBar" type="checkbox">
87-
<span>
88-
<span i18n-content="toolbarShowBookmarksBar"></span>
89-
<span class="controlled-setting-indicator"
90-
pref="bookmark_bar.show_on_all_tabs"></span>
91-
</span>
79+
<span i18n-content="toolbarShowBookmarksBar"></span>
9280
</label>
81+
<span class="controlled-setting-indicator"
82+
pref="bookmark_bar.show_on_all_tabs"></span>
9383
</div>
9484
</div>
9585
</div>

‎chrome/browser/resources/options/language_add_language_overlay.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<div class="close-button"></div>
33
<h1 i18n-content="addLanguageTitle"></h1>
44
<div class="content-area">
5-
<label id="add-language-overlay-language-list-label"
5+
<label for="add-language-overlay-language-list"
66
i18n-content="addLanguageSelectLabel"></label>
7-
<select id="add-language-overlay-language-list"
8-
aria-labelledby="add-language-overlay-language-list-label"></select>
7+
<select id="add-language-overlay-language-list"></select>
98
</div>
109
<div class="action-area button-strip">
1110
<button id="add-language-overlay-cancel-button" i18n-content="cancel">

‎chrome/browser/resources/options/manage_profile_overlay.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ <h1 i18n-content="manageProfile"></h1>
1010
<grid id="manage-profile-icon-grid"></grid>
1111
<div id="manage-profile-name-input-container">
1212
<label>
13-
<span i18n-content="manageProfilesNameLabel"></span>
13+
<span id="manage-profile-name-label" for="manage-profile-name"
14+
i18n-content="manageProfilesNameLabel">
15+
</span>
1416
<input id="manage-profile-name" type="text" pattern=".*\S.*" required>
1517
</label>
1618
</div>
@@ -81,7 +83,7 @@ <h1 i18n-content="createProfileTitle"></h1>
8183
<grid id="create-profile-icon-grid"></grid>
8284
<div id="create-profile-name-input-container">
8385
<label>
84-
<span id="create-profile-name-label"
86+
<span id="create-profile-name-label" for="create-profile-name"
8587
i18n-content="manageProfilesNameLabel">
8688
</span>
8789
<input id="create-profile-name" type="text" required>
@@ -92,7 +94,9 @@ <h1 i18n-content="createProfileTitle"></h1>
9294
<div id="create-shortcut-container" class="checkbox" hidden>
9395
<label>
9496
<input id="create-shortcut" type="checkbox">
95-
<span i18n-content="createProfileShortcutCheckbox"></span>
97+
<span for="create-shortcut"
98+
i18n-content="createProfileShortcutCheckbox">
99+
</span>
96100
</label>
97101
</div>
98102
<div id="create-profile-supervised-container" class="checkbox">

‎chrome/browser/resources/options/reset_profile_settings_overlay.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@
4848
}
4949

5050
#expand-feedback {
51-
background: url('chrome://theme/IDR_QUESTION_MARK') no-repeat center;
51+
background: center bottom no-repeat;
52+
background-image: url('chrome://theme/IDR_QUESTION_MARK');
5253
display: inline-block;
5354
height: 14px;
5455
opacity: 0.33;
56+
vertical-align: text-top;
5557
width: 14px;
5658
}
5759

5860
#expand-feedback:hover {
5961
opacity: 1;
60-
}
62+
}

‎chrome/browser/resources/options/reset_profile_settings_overlay.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ <h1 i18n-content="resetProfileSettingsOverlay"></h1>
2121
</div>
2222
</div>
2323
</div>
24-
<div id="feedback-bar"
25-
class="gray-bottom-bar checkbox controlled-setting-with-label">
26-
<label>
24+
<div id="feedback-bar" class="gray-bottom-bar checkbox">
25+
<span class="controlled-setting-with-label">
2726
<input id="send-settings" type="checkbox" checked>
2827
<span>
29-
<span i18n-content="resetProfileSettingsFeedback"></span>
30-
<span id="expand-feedback"></span>
28+
<label for="send-settings" i18n-content="resetProfileSettingsFeedback">
29+
</label>
30+
<div id='expand-feedback'></div>
3131
</span>
32-
</label>
32+
</span>
3333
<div id="feedback-template" hidden>
3434
<div>
3535
<table>

‎chrome/browser/resources/options/reset_profile_settings_overlay.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ cr.define('options', function() {
2828
initializePage: function() {
2929
Page.prototype.initializePage.call(this);
3030

31-
$('reset-profile-settings-dismiss').onclick = function(e) {
31+
$('reset-profile-settings-dismiss').onclick = function(event) {
3232
ResetProfileSettingsOverlay.dismiss();
3333
};
34-
$('reset-profile-settings-commit').onclick = function(e) {
34+
$('reset-profile-settings-commit').onclick = function(event) {
3535
ResetProfileSettingsOverlay.setResettingState(true);
3636
chrome.send('performResetProfileSettings',
3737
[$('send-settings').checked]);
3838
};
39-
$('expand-feedback').onclick = function(e) {
39+
$('expand-feedback').onclick = function(event) {
4040
var feedbackTemplate = $('feedback-template');
4141
feedbackTemplate.hidden = !feedbackTemplate.hidden;
42-
e.preventDefault();
4342
};
4443
},
4544

‎chrome/browser/resources/options/startup_section.html

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,30 @@ <h3 i18n-content="sectionTitleStartup"></h3>
77
<input type="radio" name="startup" value="5"
88
pref="session.restore_on_startup"
99
metric="Options_Startup_NewTab">
10-
<span>
11-
<span i18n-content="startupShowNewTab"></span>
12-
<span class="controlled-setting-indicator"
13-
pref="session.restore_on_startup" value="5"></span>
14-
</span>
10+
<span i18n-content="startupShowNewTab"></span>
1511
</label>
12+
<span class="controlled-setting-indicator"
13+
pref="session.restore_on_startup" value="5"></span>
1614
</div>
1715
<div class="radio controlled-setting-with-label">
1816
<label>
1917
<input id="startup-restore-session" type="radio" name="startup"
2018
value="1" pref="session.restore_on_startup"
2119
metric="Options_Startup_LastSession">
22-
<span>
23-
<span i18n-content="startupRestoreLastSession"></span>
24-
<span class="controlled-setting-indicator"
25-
pref="session.restore_on_startup" value="1"></span>
26-
</span>
20+
<span i18n-content="startupRestoreLastSession"></span>
2721
</label>
22+
<span class="controlled-setting-indicator"
23+
pref="session.restore_on_startup" value="1"></span>
2824
</div>
2925
<div class="radio controlled-setting-with-label">
3026
<label>
3127
<input id="startup-show-pages" type="radio" name="startup"
3228
pref="session.restore_on_startup"
3329
value="4" metric="Options_Startup_Custom">
34-
<span>
35-
<span i18n-content="startupShowPages"></span>
36-
<span class="controlled-setting-indicator"
37-
pref="session.restore_on_startup" value="4"></span>
38-
</span>
30+
<span i18n-content="startupShowPages"></span>
3931
</label>
32+
<span class="controlled-setting-indicator"
33+
pref="session.restore_on_startup" value="4"></span>
4034
<button id="startup-set-pages" class="link-button"
4135
i18n-content="startupSetPages">
4236
</button>

‎chrome/browser/resources/options/sync_section.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ <h3 i18n-content="sectionTitleSync"></h3>
3737
<input type="checkbox"
3838
metric="Options_ScreenLock"
3939
pref="settings.enable_screen_lock">
40-
<span>
41-
<span i18n-content="enableScreenlock"></span>
42-
<span class="controlled-setting-indicator"
43-
i18n-values="textshared:screenLockShared"
44-
pref="settings.enable_screen_lock"></span>
45-
</span>
40+
<span i18n-content="enableScreenlock"></span>
4641
</label>
42+
<span class="controlled-setting-indicator"
43+
i18n-values="textshared:screenLockShared"
44+
pref="settings.enable_screen_lock"></span>
4745
</div>
4846
</div>
4947
</if> <!-- chromeos -->

0 commit comments

Comments
 (0)