| 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="secondary-button" on-tap="onSigninTap_" | 46             <paper-button class="action-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 class="secondary-button" on-tap="onDisconnectTap_" | 
| 54                   disabled="[[syncStatus.setupInProgress]]"> | 54                   disabled="[[syncStatus.setupInProgress]]"> | 
| 55                   [[i18n('syncDisconnect')]] | 55                 [[i18n('syncDisconnect')]] | 
| 56               </paper-button> | 56               </paper-button> | 
| 57             </span> | 57             </span> | 
| 58           </template> | 58           </template> | 
| 59 </if> | 59 </if> | 
| 60         </div> | 60         </div> | 
| 61         <div class="settings-box first two-line" | 61         <div class="settings-box first two-line" | 
| 62             hidden="[[syncStatus.signedIn]]"> | 62             hidden="[[syncStatus.signedIn]]"> | 
| 63           [[i18n('syncOverview')]] | 63           [[i18n('syncOverview')]] | 
| 64         </div> | 64         </div> | 
| 65 | 65 | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127       <h2 i18n-content="syncDisconnectTitle"></h2> | 127       <h2 i18n-content="syncDisconnectTitle"></h2> | 
| 128       <div i18n-values=".innerHTML:syncDisconnectExplanation"></div> | 128       <div i18n-values=".innerHTML:syncDisconnectExplanation"></div> | 
| 129 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> | 129 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> | 
| 130       <paper-checkbox id="deleteProfile" | 130       <paper-checkbox id="deleteProfile" | 
| 131           i18n-content="syncDisconnectDeleteProfile"> | 131           i18n-content="syncDisconnectDeleteProfile"> | 
| 132       </paper-checkbox> | 132       </paper-checkbox> | 
| 133 </if> | 133 </if> | 
| 134       <div class="button-strip"> | 134       <div class="button-strip"> | 
| 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 class="action-button" | 
| 138             i18n-content="syncDisconnectConfirm"> | 138             on-tap="onDisconnectConfirm_" 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 | 
|---|