1 files changed, 0 insertions, 95 deletions
diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html
deleted file mode 100644
index 38dd2cd..0000000
--- a/chrome/browser/sync/resources/merge_and_sync.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html i18n-values="dir:textdirection;">
-<head>
-<title></title>
-<style type="text/css">
- body,td,div,p,a,font,span {font-family: arial,sans-serif;}
- body { bgcolor:"#ffffff" }
-.gaia.le.button { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
-.endaligned {
-  text-align: right;
-}
-html[dir='rtl'] .endaligned {
-  text-align: left;
-}
-.textaligned {
-  text-align: left;
-}
-html[dir='rtl'] .textaligned {
-  text-align: right;
-}
-</style>
-<script>
-    function advanceThrobber() {
-      var throbber = document.getElementById('throb');
-      throbber.style.backgroundPositionX =
-      ((parseInt(throbber.style.backgroundPositionX) - 16) % 576) + 'px';
-    }
-
-    function acceptMergeAndSync() {
-     var throbber = document.getElementById('throbber_container');
-     throbber.style.display = "inline";
-     document.getElementById("acceptMerge").disabled = true;
-     chrome.send("SubmitMergeAndSync", [""]);
-    }
-
-    function Close() {
-      chrome.send("DialogClose", [""]);
-    }
-
-    function showMergeAndSyncDone() {
-     var throbber = document.getElementById('throbber_container');
-     throbber.style.display = "none";
-     document.getElementById("header").innerHTML =
-         "<p><font size='-1'><b>" + templateData['alldone']
-         + "</b></font></p>";
-     document.getElementById("close").value = templateData['closelabel'];
-     setTimeout(Close, 1600);
-    }
-
-    function showMergeAndSyncError() {
-     var throbber = document.getElementById('throbber_container');
-     throbber.style.display = "none";
-     document.getElementById("header").innerHTML =
-         "<p><font size='-1'><b>" + templateData['setuperror']
-         + "</b></font></p>";
-    }
-
-    function onPageShown() {     
-     document.getElementById("acceptMerge").focus();
-    }
-
-</script>
-</head>
-<body onload="setInterval(advanceThrobber, 30);">
-<table height="100%">
-  <tr valign="top">
-    <td align="center">
-      <div id="header" align="left">
-        <p class="textaligned"><font size="-1"><b>
-          <span i18n-content="introduction"></span>
-        </b></font></p>
-      </div>
-      <br />
-      <img src="merge_and_sync.png" i18n-values="alt:mergeandsynclabel" />
-      <br />
-      <p class="textaligned"><font size="-1"><span i18n-content="mergeandsyncwarning"></span></font></p>
-      <br />
-      <div id="throbber_container" style="display:none">
-        <div id="throb" style="background-image:url(throbber.png);
-             width:16px; height:16px; background-position:0px;">
-        </div>
-      </div>
-    </td>
-  </tr>
-  <tr class="endaligned" valign="bottom">
-    <td class="endaligned">
-      <input id="acceptMerge" type="button" class="gaia le button" name="accept"
-             i18n-values="value:mergeandsynclabel"
-             onclick="acceptMergeAndSync();" />
-      <input id="close" type="button" i18n-values="value:abortlabel"
-             onclick="Close();"/>
-    </td>
-  </tr>
-</table>
-</body>
-</html>