chrome/browser/resources/settings/sync_page/sync_page.html - Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

Unified Diff: chrome/browser/resources/settings/sync_page/sync_page.html

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix an egreious git cl format error 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 | « chrome/browser/resources/settings/sync_page/sync_page.css ('k') | chrome/browser/resources/settings/sync_page/sync_page.js » ('j') | chrome/browser/ui/webui/settings/people_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/sync_page/sync_page.html

diff --git a/chrome/browser/resources/settings/sync_page/sync_page.html b/chrome/browser/resources/settings/sync_page/sync_page.html

deleted file mode 100644

index ca62faed8a1cffbe0e8f39369c9b930548e00cae..0000000000000000000000000000000000000000

--- a/chrome/browser/resources/settings/sync_page/sync_page.html

+++ /dev/null

@@ -1,130 +0,0 @@

-<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/paper-radio-button.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">

-<link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">

-<link rel="import" href="chrome://md-settings/sync_page/sync_private_api.html">

-<link rel="import" href="chrome://resources/html/i18n_behavior.html">

-<dom-module id="settings-sync-page">

- <link rel="import" type="css"

- href="chrome://md-settings/settings_shared.css">

- <link rel="import" type="css" href="sync_page.css">

- <template>

- <iron-pages id="pages" selected="loading" attr-for-selected="id">

- <div id="loading" i18n-content="syncLoading"></div>

- <div id="timeout" i18n-content="syncTimeout"></div>

- <div id="main">

- <div class="settings-box">

- <paper-checkbox checked="{{syncPrefs.syncAllDataTypes}}"

- on-change="onSyncAllDataTypesChanged_">

- <span i18n-content="syncEverythingCheckboxLabel">

- </paper-checkbox>

- <div id="sync-item-list">

- <paper-checkbox checked="{{syncPrefs.appsSynced}}"

- hidden="[[!syncPrefs.appsRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]">

- <span i18n-content="appCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.autofillSynced}}"

- hidden="[[!syncPrefs.autofillRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]">

- <span i18n-content="autofillCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}"

- hidden="[[!syncPrefs.bookmarksRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]">

- <span i18n-content="bookmarksCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.extensionsSynced}}"

- hidden="[[!syncPrefs.extensionsRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.extensionsEnforced)]]">

- <span i18n-content="extensionsCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.typedUrlsSynced}}"

- hidden="[[!syncPrefs.typedUrlsRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.typedUrlsEnforced)]]">

- <span i18n-content="historyCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.passwordsSynced}}"

- hidden="[[!syncPrefs.passwordsRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.passwordsEnforced)]]">

- <span i18n-content="passwordsCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.preferencesSynced}}"

- hidden="[[!syncPrefs.preferencesRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]">

- <span i18n-content="settingsCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.themesSynced}}"

- hidden="[[!syncPrefs.themesRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]">

- <span i18n-content="themesAndWallpapersCheckboxLabel"></span>

- </paper-checkbox>

- <paper-checkbox checked="{{syncPrefs.tabsSynced}}"

- hidden="[[!syncPrefs.tabsRegistered]]"

- disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]">

- <span i18n-content="openTabsCheckboxLabel"></span>

- </paper-checkbox>

- </div>

- <div class="settings-box">

- <h2 i18n-content="encryptionOptionsTitle"></h2>

- <p i18n-content="syncDataEncryptedText"></p>

- <template is="dom-if" if="[[!syncPrefs.showPassphrase]]">

- <paper-radio-group id="encryptRadioGroup"

- selected="[[selectedEncryptionRadio_(syncPrefs.usePassphrase, syncPrefs.encryptAllData)]]"

- on-paper-radio-group-changed="onEncryptionRadioSelectionChanged_">

- <paper-radio-button name="encrypt-with-google"

- disabled="[[encryptionRadiosDisabled_(syncPrefs.usePassphrase, syncPrefs.encryptAllData)]]">

- <span>[[i18n('encryptWithGoogleCredentialsLabel')]]</span>

- </paper-radio-button>

- <paper-radio-button name="encrypt-with-passphrase"

- disabled="[[encryptionRadiosDisabled_(syncPrefs.usePassphrase, syncPrefs.encryptAllData)]]">

- <span>[[encryptWithPassphraseBody_(syncPrefs.fullEncryptionBody)]]</span>

- </paper-radio-button>

- </paper-radio-group>

- </template>

- <template is="dom-if" if="[[creatingNewPassphrase]]">

- <div>[[i18n('passphraseExplanationText')]]</div>

- <paper-input id="passphraseInput" type="password"

- placeholder="[[i18n('passphrasePlaceholder')]]">

- </paper-input>

- <paper-input id="passphraseConfirmationInput" type="password"

- placeholder="[[i18n('passphraseConfirmationPlaceholder')]]">

- </paper-input>

- <div id="emptyPassphraseError" hidden>[[i18n('emptyPassphraseError')]]</div>

- <div id="mismatchedPassphraseError" hidden>[[i18n('mismatchedPassphraseError')]]</div>

- </template>

- <template is="dom-if" if="[[syncPrefs.showPassphrase]]">

- <div id="askCustomPassphraseMessage"

- hidden="[[askOldGooglePassphrase]]">[[syncPrefs.enterPassphraseBody]]</div>

- <div id="askOldGooglePassphraseMessage"

- hidden="[[!askOldGooglePassphrase]]">[[syncPrefs.enterGooglePassphraseBody]]</div>

- <paper-input id="existingPassphraseInput" type="password"

- placeholder="[[i18n('passphrasePlaceholder')]]">

- </paper-input>

- <div id="incorrectPassphraseError" hidden>[[i18n('incorrectPassphraseError')]]</div>

- </template>

- </div>

- <div class="settings-box">

- <paper-button i18n-content="cancelButton" on-tap="onCancelTap_">

- </paper-button>

- <paper-button i18n-content="okButton" on-tap="onOkTap_" raised>

- </paper-button>

- </div>

- </iron-pages>

- </template>

- <script src="sync_page.js"></script>

-</dom-module>