Index: chrome/browser/resources/settings/people_page/people_page.js |
diff --git a/chrome/browser/resources/settings/people_page/people_page.js b/chrome/browser/resources/settings/people_page/people_page.js |
index 5698401c9806adf1293cdc77451f288973c87f53..a3e372f3f883fc92f3f8342f4aae7c4a4e8c22d5 100644 |
--- a/chrome/browser/resources/settings/people_page/people_page.js |
+++ b/chrome/browser/resources/settings/people_page/people_page.js |
@@ -13,9 +13,9 @@ Polymer({ |
settings.RouteObserverBehavior, |
I18nBehavior, |
WebUIListenerBehavior, |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
LockStateBehavior, |
-</if> |
+// </if> |
], |
properties: { |
@@ -65,13 +65,13 @@ Polymer({ |
*/ |
deleteProfile_: Boolean, |
-<if expr="not chromeos"> |
+// <if expr="not chromeos"> |
/** @private */ |
showImportDataDialog_: { |
type: Boolean, |
value: false, |
}, |
-</if> |
+// </if> |
/** @private {!settings.SyncBrowserProxy} */ |
syncBrowserProxy_: { |
@@ -81,7 +81,7 @@ Polymer({ |
}, |
}, |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
/** |
* True if quick unlock settings should be displayed on this machine. |
* @private |
@@ -140,7 +140,7 @@ Polymer({ |
type: Boolean, |
value: false, |
}, |
-</if> |
+// </if> |
}, |
/** @override */ |
@@ -163,7 +163,7 @@ Polymer({ |
this.addWebUIListener('sync-status-changed', |
this.handleSyncStatus_.bind(this)); |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
if (this.easyUnlockAllowed_) { |
this.addWebUIListener( |
'easy-unlock-enabled-status', |
@@ -171,7 +171,7 @@ Polymer({ |
this.easyUnlockBrowserProxy_.getEnabledStatus().then( |
this.handleEasyUnlockEnabledStatusChanged_.bind(this)); |
} |
-</if> |
+// </if> |
}, |
/** @protected */ |
@@ -195,7 +195,7 @@ Polymer({ |
} |
}, |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
/** @private */ |
getPasswordState_: function(hasPin, enableScreenLock) { |
if (!enableScreenLock) |
@@ -204,7 +204,7 @@ Polymer({ |
return this.i18n('lockScreenPinOrPassword'); |
return this.i18n('lockScreenPasswordOnly'); |
}, |
-</if> |
+// </if> |
/** |
* Handler for when the profile's icon and name is updated. |
@@ -256,7 +256,7 @@ Polymer({ |
this.syncStatus = syncStatus; |
}, |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
/** |
* Handler for when the Easy Unlock enabled status has changed. |
* @private |
@@ -266,24 +266,24 @@ Polymer({ |
this.showEasyUnlockTurnOffDialog_ = |
easyUnlockEnabled && this.showEasyUnlockTurnOffDialog_; |
}, |
-</if> |
+// </if> |
/** @private */ |
onPictureTap_: function() { |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
settings.navigateTo(settings.Route.CHANGE_PICTURE); |
-</if> |
-<if expr="not chromeos"> |
+// </if> |
+// <if expr="not chromeos"> |
settings.navigateTo(settings.Route.MANAGE_PROFILE); |
-</if> |
+// </if> |
}, |
-<if expr="not chromeos"> |
+// <if expr="not chromeos"> |
/** @private */ |
onProfileNameTap_: function() { |
settings.navigateTo(settings.Route.MANAGE_PROFILE); |
}, |
-</if> |
+// </if> |
/** @private */ |
onActivityControlsTap_: function() { |
@@ -341,10 +341,10 @@ Polymer({ |
this.syncBrowserProxy_.startSignIn(); |
break; |
case settings.StatusAction.SIGNOUT_AND_SIGNIN: |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
this.syncBrowserProxy_.attemptUserExit(); |
-</if> |
-<if expr="not chromeos"> |
+// </if> |
+// <if expr="not chromeos"> |
if (this.syncStatus.domain) |
settings.navigateTo(settings.Route.SIGN_OUT); |
else { |
@@ -353,7 +353,7 @@ Polymer({ |
this.syncBrowserProxy_.signOut(false); |
this.syncBrowserProxy_.startSignIn(); |
} |
-</if> |
+// </if> |
break; |
case settings.StatusAction.UPGRADE_CLIENT: |
settings.navigateTo(settings.Route.ABOUT); |
@@ -365,7 +365,7 @@ Polymer({ |
} |
}, |
-<if expr="chromeos"> |
+// <if expr="chromeos"> |
/** @private */ |
onConfigureLockTap_: function() { |
settings.navigateTo(settings.Route.LOCK_SCREEN); |
@@ -389,16 +389,16 @@ Polymer({ |
onEasyUnlockTurnOffDialogClose_: function() { |
this.showEasyUnlockTurnOffDialog_ = false; |
}, |
-</if> |
+// </if> |
/** @private */ |
onManageOtherPeople_: function() { |
-<if expr="not chromeos"> |
+// <if expr="not chromeos"> |
this.syncBrowserProxy_.manageOtherPeople(); |
-</if> |
-<if expr="chromeos"> |
+// </if> |
+// <if expr="chromeos"> |
settings.navigateTo(settings.Route.ACCOUNTS); |
-</if> |
+// </if> |
}, |
/** @private */ |
@@ -406,7 +406,7 @@ Polymer({ |
window.open(loadTimeData.getString('supervisedUsersUrl')); |
}, |
-<if expr="not chromeos"> |
+// <if expr="not chromeos"> |
/** |
* @private |
* @param {string} domain |
@@ -427,7 +427,7 @@ Polymer({ |
onImportDataDialogClosed_: function() { |
settings.navigateToPreviousRoute(); |
}, |
-</if> |
+// </if> |
/** |
* @private |
@@ -435,13 +435,13 @@ Polymer({ |
* @return {string} |
*/ |
getDisconnectExplanationHtml_: function(domain) { |
-<if expr="not chromeos"> |
+// <if expr="not chromeos"> |
if (domain) { |
return loadTimeData.getStringF( |
'syncDisconnectManagedProfileExplanation', |
'<span id="managed-by-domain-name">' + domain + '</span>'); |
} |
-</if> |
+// </if> |
return loadTimeData.getString('syncDisconnectExplanation'); |
}, |