| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> |
| 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> | 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 8 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> | 8 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> |
| 9 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html"
> | 9 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html"
> |
| 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa
ges.html"> | 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa
ges.html"> |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 </span> | 36 </span> |
| 37 </if> | 37 </if> |
| 38 <if expr="not chromeos"> | 38 <if expr="not chromeos"> |
| 39 <span id="profile-name"> | 39 <span id="profile-name"> |
| 40 [[profileName_]] | 40 [[profileName_]] |
| 41 </span> | 41 </span> |
| 42 </if> | 42 </if> |
| 43 </div> | 43 </div> |
| 44 <if expr="not chromeos"> | 44 <if expr="not chromeos"> |
| 45 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 45 <template is="dom-if" if="[[!syncStatus.signedIn]]"> |
| 46 <paper-button class="primary-button" on-tap="onSigninTap_" raised | 46 <paper-button class="secondary-button" on-tap="onSigninTap_" |
| 47 disabled="[[syncStatus.setupInProgress]]"> | 47 disabled="[[syncStatus.setupInProgress]]"> |
| 48 [[i18n('syncSignin')]] | 48 [[i18n('syncSignin')]] |
| 49 </paper-button> | 49 </paper-button> |
| 50 </template> | 50 </template> |
| 51 <template is="dom-if" if="[[syncStatus.signedIn]]"> | 51 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 52 <span class="secondary-action"> | 52 <span class="secondary-action"> |
| 53 <paper-button on-tap="onDisconnectTap_" | 53 <paper-button on-tap="onDisconnectTap_" |
| 54 disabled="[[syncStatus.setupInProgress]]"> | 54 disabled="[[syncStatus.setupInProgress]]"> |
| 55 [[i18n('syncDisconnect')]] | 55 [[i18n('syncDisconnect')]] |
| 56 </paper-button> | 56 </paper-button> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 67 hidden="[[!isStatusTextSet_(syncStatus)]]"> | 67 hidden="[[!isStatusTextSet_(syncStatus)]]"> |
| 68 <span id="syncStatusText"></span> | 68 <span id="syncStatusText"></span> |
| 69 <paper-button on-tap="onActionLinkTap_"> | 69 <paper-button on-tap="onActionLinkTap_"> |
| 70 [[syncStatus.actionLinkText]] | 70 [[syncStatus.actionLinkText]] |
| 71 </paper-button> | 71 </paper-button> |
| 72 </div> | 72 </div> |
| 73 | 73 |
| 74 <template is="dom-if" | 74 <template is="dom-if" |
| 75 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 75 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 76 <div class="settings-box"> | 76 <div class="settings-box"> |
| 77 <paper-button on-tap="onSyncTap_" raised> | 77 <paper-button on-tap="onSyncTap_" class="primary-button"> |
| 78 [[i18n('syncPageTitle')]] | 78 [[i18n('syncPageTitle')]] |
| 79 </paper-button> | 79 </paper-button> |
| 80 </div> | 80 </div> |
| 81 </template> | 81 </template> |
| 82 | 82 |
| 83 <if expr="chromeos"> | 83 <if expr="chromeos"> |
| 84 <div class="settings-box"> | 84 <div class="settings-box"> |
| 85 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 85 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 86 i18n-values="label:enableScreenlock"> | 86 i18n-values="label:enableScreenlock"> |
| 87 </settings-checkbox> | 87 </settings-checkbox> |
| 88 </div> | 88 </div> |
| 89 </if> | 89 </if> |
| 90 | 90 |
| 91 <div class="settings-box"> | 91 <div class="settings-box"> |
| 92 <paper-button class="link-button" i18n-content="manageOtherPeople" | 92 <paper-button class="primary-button" i18n-content="manageOtherPeople" |
| 93 on-tap="onManageOtherPeople_"> | 93 on-tap="onManageOtherPeople_"> |
| 94 </paper-button> | 94 </paper-button> |
| 95 </div> | 95 </div> |
| 96 </neon-animatable> | 96 </neon-animatable> |
| 97 <neon-animatable id="sync"> | 97 <neon-animatable id="sync"> |
| 98 <settings-subheader i18n-values="page-title:syncPageTitle"> | 98 <settings-subheader i18n-values="page-title:syncPageTitle"> |
| 99 </settings-subheader> | 99 </settings-subheader> |
| 100 <settings-sync-page current-route="[[currentRoute]]"> | 100 <settings-sync-page current-route="[[currentRoute]]"> |
| 101 </settings-sync-page> | 101 </settings-sync-page> |
| 102 </neon-animatable> | 102 </neon-animatable> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 <paper-button dialog-dismiss i18n-content="cancel"> | 135 <paper-button dialog-dismiss i18n-content="cancel"> |
| 136 </paper-button> | 136 </paper-button> |
| 137 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_" | 137 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_" |
| 138 i18n-content="syncDisconnectConfirm"> | 138 i18n-content="syncDisconnectConfirm"> |
| 139 </paper-button> | 139 </paper-button> |
| 140 </div> | 140 </div> |
| 141 </paper-dialog> | 141 </paper-dialog> |
| 142 </template> | 142 </template> |
| 143 <script src="people_page.js"></script> | 143 <script src="people_page.js"></script> |
| 144 </dom-module> | 144 </dom-module> |
| OLD | NEW |