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

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

Issue 2538043006: Settings: About: Fix cros channel info. (Closed)
Patch Set: Fix non cros tests Created 4 years 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_browser_proxy.js
diff --git a/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js b/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js
index 22c88f89ce453667c5648a27acce93ab11ed1149..b1ee8af3c2f5170a61a000f4cb3a944a99fe8943 100644
--- a/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js
+++ b/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js
@@ -18,6 +18,15 @@ var RegulatoryInfo;
/**
* @typedef {{
+ * currentChannel: string,
+ * targetChannel: string,
+ * canChangeChannel: boolean,
+ * }}
+ */
+var ChannelInfo;
+
+/**
+ * @typedef {{
* arcVersion: string,
* osFirmware: string,
* osVersion: string,
@@ -130,11 +139,8 @@ cr.define('settings', function() {
*/
setChannel: function(channel, isPowerwashAllowed) {},
- /** @return {!Promise<!BrowserChannel>} */
- getCurrentChannel: function() {},
-
- /** @return {!Promise<!BrowserChannel>} */
- getTargetChannel: function() {},
+ /** @return {!Promise<!ChannelInfo>} */
+ getChannelInfo: function() {},
/** @return {!Promise<!VersionInfo>} */
getVersionInfo: function() {},
@@ -186,13 +192,8 @@ cr.define('settings', function() {
},
/** @override */
- getCurrentChannel: function() {
- return cr.sendWithPromise('getCurrentChannel');
- },
-
- /** @override */
- getTargetChannel: function() {
- return cr.sendWithPromise('getTargetChannel');
+ getChannelInfo: function() {
+ return cr.sendWithPromise('getChannelInfo');
},
/** @override */

Powered by Google App Engine
This is Rietveld 408576698