chrome/browser/resources/sync_setup_overlay.html - Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

Side by Side Diff: chrome/browser/resources/sync_setup_overlay.html

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master

Patch Set: resolve conflicts with https://codereview.chromium.org/673983003 Created 6 years, 1 month 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

OLD	NEW
1 <div id="sync-setup-overlay" class="page" hidden>	1 <div id="sync-setup-overlay" class="page" hidden>

2 <div class="close-button"></div>	2 <div class="close-button"></div>

3 <div id="sync-setup-configure" hidden>	3 <div id="sync-setup-configure" hidden>

4 <div id="confirm-sync-preferences">	4 <div id="confirm-sync-preferences">

5 <h1 i18n-content="confirmSyncPreferences"></h1>	5 <h1 i18n-content="confirmSyncPreferences"></h1>

6 <div id="sync-instructions-container" class="content-area">	6 <div id="sync-instructions-container" class="content-area">

7 <span i18n-content="chooseDataTypesInstructions"></span>	7 <span i18n-content="chooseDataTypesInstructions"></span>

8 <a id="encryption-help-link" target="_blank"	8 <a id="encryption-help-link" target="_blank"

9 i18n-values="href:syncEverythingHelpURL" i18n-content="learnMore">	9 i18n-values="href:syncEverythingHelpURL" i18n-content="learnMore">

10 </a>	10 </a>

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 </span>	95 </span>

96 </label>	96 </label>

97 </div>	97 </div>

98 <div id="tabs-item" class="sync-type-checkbox checkbox">	98 <div id="tabs-item" class="sync-type-checkbox checkbox">

99 <label>	99 <label>

100 <input id="tabs-checkbox" type="checkbox">	100 <input id="tabs-checkbox" type="checkbox">

101 <span i18n-content="openTabs" il8n-values="title:tabs">	101 <span i18n-content="openTabs" il8n-values="title:tabs">

102 </span>	102 </span>

103 </label>	103 </label>

104 </div>	104 </div>

	105 <div id="wifi-credentials-item" class="sync-type-checkbox checkbox ">

	106 <label>

	107 <input id="wifi-credentials-checkbox" type="checkbox">

	108 <span i18n-content="wifiCredentials" il8n-values="title:wifiCr edentials">

	109 </span>

	110 </label>

	111 </div>

105 </div>	112 </div>

106 </div>	113 </div>

107 <div id="customize-sync-encryption-new">	114 <div id="customize-sync-encryption-new">

108 <hr>	115 <hr>

109 <h4 i18n-content="encryptionSectionTitle"></h4>	116 <h4 i18n-content="encryptionSectionTitle"></h4>

110 <div id="encryption-section-message"	117 <div id="encryption-section-message"

111 i18n-content="encryptionSectionMessage"></div>	118 i18n-content="encryptionSectionMessage"></div>

112 <div id="sync-new-encryption-section-container">	119 <div id="sync-new-encryption-section-container">

113 <div class="radio">	120 <div class="radio">

114 <label>	121 <label>

(...skipping 112 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227 </if>	234 </if>

228 </div>	235 </div>

229 <div class="action-area button-strip">	236 <div class="action-area button-strip">

230 <input id="stop-syncing-cancel" type="button"	237 <input id="stop-syncing-cancel" type="button"

231 i18n-values="value:cancel">	238 i18n-values="value:cancel">

232 <input id="stop-syncing-ok" type="button"	239 <input id="stop-syncing-ok" type="button"

233 i18n-values="value:stopSyncingConfirm">	240 i18n-values="value:stopSyncingConfirm">

234 </div>	241 </div>

235 </div>	242 </div>

236 </div>	243 </div>

OLD	NEW

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_setup_overlay.js » ('j') | chrome/browser/resources/sync_setup_overlay.js » ('J')