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

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

Issue 2006073002: MD Settings: About page, show regulatory info, if available. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_copyright
Patch Set: Address comment. Created 4 years, 7 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/about_page/about_page.js
diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js
index e6223d4429c3f89516542924476dfab099ee7c16..e73128504178068b9ab90af169351b96df3bb80e 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js
@@ -32,6 +32,9 @@ Polymer({
/** @private {!BrowserChannel} */
targetChannel_: String,
+
+ /** @private {?RegulatoryInfo} */
+ regulatoryInfo_: Object,
</if>
},
@@ -60,6 +63,10 @@ Polymer({
this.startListening_();
}.bind(this));
+
+ this.browserProxy_.getRegulatoryInfo().then(function(info) {
+ this.regulatoryInfo_ = info;
+ }.bind(this));
</if>
<if expr="not chromeos">
this.startListening_();
@@ -242,6 +249,14 @@ Polymer({
return !this.hasCheckedForUpdates_ ||
this.currentUpdateStatusEvent_.status == UpdateStatus.FAILED;
},
+
+ /**
+ * @return {boolean}
+ * @private
+ */
+ shouldShowRegulatoryInfo_: function() {
+ return this.regulatoryInfo_ !== null;
+ },
</if>
<if expr="_google_chrome">
« no previous file with comments | « chrome/browser/resources/settings/about_page/about_page.html ('k') | chrome/test/data/webui/settings/about_page_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698