Support 2x resoruce in about_conflicts.html

chrome/browser/resources/about_conflicts.html

Index: chrome/browser/resources/about_conflicts.html
diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html
index 66acab00d8fcaae80f1853437b2c19a1905243c4..80773dc7fe39b78ec87b5626078d1a5b40a7182a 100644
--- a/chrome/browser/resources/about_conflicts.html
+++ b/chrome/browser/resources/about_conflicts.html
@@ -26,7 +26,11 @@ div#header {
 }
 
 #header h1 {
-  background: url('../../app/theme/default_100_percent/common/about_conflicts.png') 0px 20px no-repeat;
+  background-image: -webkit-image-set(
+      url('../../app/theme/default_100_percent/common/about_conflicts.png') 1x,
+      url('../../app/theme/default_200_percent/common/about_conflicts.png') 2x);
+  background-position: 0px 20px;
+  background-repeat: no-repeat;
   display: inline;
   margin: 0;
   padding-bottom: 43px;
@@ -35,7 +39,11 @@ div#header {
 }
 
 html[dir=rtl] #header h1 {
-  background: url('../../app/theme/default_100_percent/common/about_conflicts.png') right no-repeat;
+  background-image: -webkit-image-set(
+      url('../../app/theme/default_100_percent/common/about_conflicts.png') 1x,
+      url('../../app/theme/default_200_percent/common/about_conflicts.png') 2x);
+  background-position: right;
+  background-repeat: no-repeat;
   padding-right: 95px;
   padding-left: 0;
 }