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

Unified Diff: chrome/browser/resources/media_router/elements/route_details/route_details.js

Issue 2938173004: [Media Router] Add a supports_web_ui_controller attribute to MediaRoute (Closed)
Patch Set: Rebase Created 3 years, 6 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/media_router/elements/route_details/route_details.js
diff --git a/chrome/browser/resources/media_router/elements/route_details/route_details.js b/chrome/browser/resources/media_router/elements/route_details/route_details.js
index eeaf2a5de7702fdc2b997e2c7c3670c04b3e2c20..bf4e6aec1d6126d3ac6eedb72c1bd71dabfdd237 100644
--- a/chrome/browser/resources/media_router/elements/route_details/route_details.js
+++ b/chrome/browser/resources/media_router/elements/route_details/route_details.js
@@ -33,8 +33,7 @@ Polymer({
*/
controllerType_: {
type: Number,
- computed: 'computeControllerType_(useWebUiRouteControls,' +
- 'isExtensionViewReady)',
+ computed: 'computeControllerType_(route, isExtensionViewReady)',
},
/**
@@ -95,16 +94,6 @@ Polymer({
type: Object,
value: null,
},
-
- /**
- * Whether we should use the WebUI route controls. This value is used for
- * updating |controllerType_|,
- * @type {boolean}
- */
- useWebUiRouteControls: {
- type: Boolean,
- value: false,
- },
},
behaviors: [
@@ -161,14 +150,13 @@ Polymer({
},
/**
- * @param {boolean} useWebUiRouteControls
+ * @param {?media_router.Route} route
* @param {boolean} isExtensionViewReady
* @return {number} An enum value to represent the controller to show.
* @private
*/
- computeControllerType_: function(
- useWebUiRouteControls, isExtensionViewReady) {
- if (useWebUiRouteControls) {
+ computeControllerType_: function(route, isExtensionViewReady) {
+ if (route && route.supportsWebUiController) {
return media_router.ControllerType.WEBUI;
}
if (isExtensionViewReady) {
@@ -251,6 +239,15 @@ Polymer({
}
},
+ /**
+ * @param {?media_router.Route} route
+ * @return {boolean}
+ * @private
+ */
+ shouldAttemptLoadingExtensionView_: function(route) {
+ return !!route && !route.supportsWebUiController;
+ },
+
/**
* @param {number} controllerType
* @return {boolean} Whether the extensionview should be shown instead of the

Powered by Google App Engine
This is Rietveld 408576698