[MD settings] site exceptions, use embedding origin rather than embeddingDisplayName

chrome/browser/resources/settings/site_settings/site_list.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 363 matching lines @@
     this.activeDialogAnchor_ = null;
   },
 
   /** @private */
   onResetTap_: function() {
     this.resetPermissionForOrigin_(this.actionMenuSite_);
     this.closeActionMenu_();
   },
 
   /**
    * Returns the appropriate site description to display. This can, for example,

[msramek, 2017/06/01 23:09:59]

Please update the jsdoc to reflect the change.

[dschuyler, 2017/06/13 20:49:25]

I've changed the code to match the prior output more closely.

    * be blank, an 'embedded on <site>' or 'Current incognito session' (or a
    * mix of the last two).
    * @param {SiteException} item The site exception entry.
    * @return {string} The site description.
    */
   computeSiteDescription_: function(item) {

[msramek, 2017/06/01 23:09:59]

So, this will change the current strings

"""
google.com
embedded on example.com
"""

into

"""
google.com
example.com
"""

and

"""
google.com
Current Incognito session (embedded on example.com)
"""

into

"""
google.com
Current Incognito session (example.com)
"""

correct? I'm not sure I understand the rationale. It is quite clear to me that a
pair of exceptions means requesting and embedding origin, but I'm familiar with
this UI. I would still spell it out for the user, especially since we're already
verbose with the Incognito part anyway.

[dschuyler, 2017/06/13 20:49:25]

Okay, thanks! I've changed the code to match the prior output more closely.

-    if (item.incognito && item.embeddingDisplayName.length > 0) {
-      return loadTimeData.getStringF('embeddedIncognitoSite',
-          item.embeddingDisplayName);
+    if (item.incognito && item.embeddingOrigin.length > 0) {
+      return loadTimeData.getStringF(
+          'embeddedIncognitoSite', item.embeddingOrigin);
     }
 
     if (item.incognito)
       return loadTimeData.getString('incognitoSite');
-    return item.embeddingDisplayName;
+    return item.embeddingOrigin;
   },
 
   /**
    * @param {!{model: !{item: !SiteException}}} e
    * @private
    */
   onResetButtonTap_: function(e) {
     this.resetPermissionForOrigin_(e.model.item);
   },
 
@@ skipping 13 matching lines @@
   /** @private */
   closeActionMenu_: function() {
     this.actionMenuSite_ = null;
     this.activeDialogAnchor_ = null;
     var actionMenu = /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]'));
     if (actionMenu.open)
       actionMenu.close();
   },
 });