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

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

Index: chrome/browser/resources/settings/site_settings/site_list.js
diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js
index e95115fe7d38cee04a54fec5227ea0b27c8c41c4..27ac12f26f9710dbdfacfd5e1d17bc8331d535aa 100644
--- a/chrome/browser/resources/settings/site_settings/site_list.js
+++ b/chrome/browser/resources/settings/site_settings/site_list.js
@@ -388,14 +388,14 @@ Polymer({
    * @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;
   },
 
   /**