Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4414)

Unified Diff: chrome/browser/resources/settings/basic_page/basic_page.js

Issue 2964293002: CrOS Settings: Add skeleton page for multidevice section. (Closed)
Patch Set: Minor cleanups Created 3 years, 5 months 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
Index: chrome/browser/resources/settings/basic_page/basic_page.js
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.js b/chrome/browser/resources/settings/basic_page/basic_page.js
index fe8cc8629fefeca5e288ccda49a0e075c5abfaa2..bee8dac14afc706835e965c2b1aaa738ab7c6667 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.js
+++ b/chrome/browser/resources/settings/basic_page/basic_page.js
@@ -20,6 +20,8 @@ Polymer({
showAndroidApps: Boolean,
dpapad 2017/07/06 01:26:50 Should lines 21-25 be wrapped in an <if expr="chro
Oren Blasberg 2017/07/06 18:17:58 Done. Btw, how does that work, if it's commented o
dpapad 2017/07/06 18:59:02 Yes. GRIT is preprocessing those, see https://cs.c
+ showMultidevice: Boolean,
+
havePlayStoreApp: Boolean,
/** @type {!AndroidAppsInfo|undefined} */
@@ -183,6 +185,17 @@ Polymer({
return !this.hasExpandedSection_ &&
loadTimeData.getBoolean('isSecondaryUser');
},
+
+ /**
+ * Whether to show the multidevice settings page.
+ * @param {boolean|undefined} visibility
+ * @return {boolean}
dpapad 2017/07/06 01:26:50 Nit: Move comment from line 190 to here, as @retur
Oren Blasberg 2017/07/06 18:17:58 Done.
+ * @private
+ */
+ showMultidevicePage_: function(visibility) {
dpapad 2017/07/06 01:26:50 Where is this used?
Oren Blasberg 2017/07/06 18:17:58 Oops. It was superseded by shouldShowMultidevice_
+ return loadTimeData.getBoolean('enableMultideviceSettings') &&
+ this.showPage_(visibility);
+ },
// </if>
/** @private */
@@ -219,6 +232,16 @@ Polymer({
return true;
},
+ /**
+ * @return {boolean}
+ * @private
+ */
+ shouldShowMultidevice_: function() {
+ var visibility = /** @type {boolean|undefined} */ (
+ this.get('pageVisibility.multidevice'));
+ return this.showMultidevice && this.showPage_(visibility);
+ },
+
/**
* Hides everything but the newly expanded subpage.
* @private

Powered by Google App Engine
This is Rietveld 408576698