Index: chrome/browser/resources/settings/android_apps_page/android_apps_page.js |
diff --git a/chrome/browser/resources/settings/android_apps_page/android_apps_page.js b/chrome/browser/resources/settings/android_apps_page/android_apps_page.js |
index 861731780652ab51607d5907c609012ddb6e61da..f38b049b0531cfa2872e007fc9011ad3bda30d65 100644 |
--- a/chrome/browser/resources/settings/android_apps_page/android_apps_page.js |
+++ b/chrome/browser/resources/settings/android_apps_page/android_apps_page.js |
@@ -45,16 +45,31 @@ Polymer({ |
/** @override */ |
ready: function() { |
- cr.addWebUIListener( |
+ this.listener_ = cr.addWebUIListener( |
'android-apps-info-update', this.androidAppsInfoUpdate_.bind(this)); |
this.browserProxy_.requestAndroidAppsInfo(); |
}, |
+ |
/** |
* @param {AndroidAppsInfo} info |
* @private |
*/ |
androidAppsInfoUpdate_: function(info) { |
this.androidAppsInfo_ = info; |
+ if (!this.androidAppsInfo_.playStoreEnabled && |
+ settings.getCurrentRoute() == settings.Route.ANDROID_APPS_DETAILS) { |
+ settings.navigateToPreviousRoute(); |
+ } |
+ }, |
+ |
+ /** |
+ * Discards current element from handling android-apps-info-update events. |
+ */ |
+ discardForTest: function() { |
+ if (this.listener_) { |
+ cr.removeWebUIListener(this.listener_); |
+ this.listener_ = null; |
+ } |
}, |
/** |
@@ -68,7 +83,7 @@ Polymer({ |
/** @private */ |
onSubpageTap_: function() { |
- if (this.androidAppsInfo_.appReady) |
+ if (this.androidAppsInfo_.playStoreEnabled) |
settings.navigateTo(settings.Route.ANDROID_APPS_DETAILS); |
}, |
}); |