2 files changed, 28 insertions, 18 deletions

diff --git a/chromium/chrome/browser/resources/conflicts/about_conflicts.html b/chromium/chrome/browser/resources/conflicts/about_conflicts.html
index efeabe223b0..c8da460f8c8 100644
--- a/chromium/chrome/browser/resources/conflicts/about_conflicts.html
+++ b/chromium/chrome/browser/resources/conflicts/about_conflicts.html
@@ -11,7 +11,7 @@ body {
 
 a {
   color: blue;
-  font-size: 103%;
+  text-decoration: none;
 }
 
 #header {
@@ -96,8 +96,8 @@ div.content {
   padding-top: 5px;
 }
 
-.module {
-  border-bottom: 1px solid #cdcdcd;
+.module:hover {
+  background: rgb(255, 255, 170);
 }
 
 .module-name {
@@ -110,23 +110,10 @@ div.content {
   text-align: center;
 }
 
-.suspected-bad {
-  color: rgb(221, 119, 0);
-}
-
-.confirmed-bad {
-  color: red;
-}
-
 .nowrap {
   white-space: nowrap;
 }
 
-.extra-info-text {
-  margin-bottom: 1em;
-  margin-top: -1em;
-}
-
 .clearing {
   clear: left;
   float: left;
@@ -150,7 +137,9 @@ html[dir=rtl] .clearing {
   <div id="header"><h1>Modules loaded</h1></div>
 
   <div id="blurb-container">
-    <span>This page lists all modules loaded into the browser and renderer processes and modules registered to load at a later point.</span>
+    <span>This page lists <a href="#">all</a> modules loaded into the
+       <a href="#B">browser</a> and <a href="#R">renderer</a> processes and
+       modules registered to load at a <a href="#None">later</a> point.</span>
   </div>
 
   <div id="modulesTemplate">
@@ -211,7 +200,8 @@ html[dir=rtl] .clearing {
               <span dir="ltr">Conflicts Status</span>
             </td>
           </tr>
-          <tr jsselect="moduleList">
+          <tr jsvalues="data-process:process_types.toLowerCase()"
+            jsselect="moduleList" class="module">
             <td valign="top" class="datacell">
               <span dir="ltr"
                     jsvalues=".innerHTML:description"
diff --git a/chromium/chrome/browser/resources/conflicts/about_conflicts.js b/chromium/chrome/browser/resources/conflicts/about_conflicts.js
index eb750549ea5..f44af07a016 100644
--- a/chromium/chrome/browser/resources/conflicts/about_conflicts.js
+++ b/chromium/chrome/browser/resources/conflicts/about_conflicts.js
@@ -43,15 +43,35 @@ function requestModuleListData() {
 }
 
 /**
+ * Filters list of displayed modules to those listed in the process types
+ * specified in the url fragment. For instance, chrome://conflicts/#r will show
+ * only those modules that have loaded into a renderer.
+ */
+function filterModuleListData() {
+  const filter = window.location.hash.substr(1).toLowerCase();
+  const modules = document.getElementsByClassName('module');
+
+  // Loop through all modules, and hide all that don't match the filter.
+  for (i = 0; i < modules.length; ++i) {
+    modules[i].style.display =
+        modules[i].dataset.process.includes(filter) ? '' : 'none';
+  }
+}
+
+/**
  * Called by the WebUI to re-populate the page with data representing the
  * current state of installed modules.
  * @param {Object} moduleListData Information about available modules.
  */
 function returnModuleList(moduleListData) {
   renderTemplate(moduleListData);
+  if (window.location.hash.length > 1) {
+    filterModuleListData();
+  }
   $('loading-message').style.visibility = 'hidden';
   $('body-container').style.visibility = 'visible';
 }
 
 // Get data and have it displayed upon loading.
 document.addEventListener('DOMContentLoaded', requestModuleListData);
+window.addEventListener('hashchange', filterModuleListData, false);