diff --git a/web/viewer.js b/web/viewer.js
index b2a1df078..8d1facdca 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -675,18 +675,17 @@ var PDFView = {
    * @param {String} anchor The anchor hash, including the #.
    */
   getAnchorUrl: function getAnchorUrl(anchor) {
-//#if !(FIREFOX || MOZCENTRAL || CHROME)
+//#if (GENERIC || B2G)
     return anchor;
-//#else
-//#if CHROME
-//  return location.href.split('#')[0] + anchor;
-//#else
+//#endif
+//#if (FIREFOX || MOZCENTRAL)
 //  return this.url.split('#')[0] + anchor;
 //#endif
+//#if CHROME
+//  return location.href.split('#')[0] + anchor;
 //#endif
   },
 
-
   /**
    * Show the error box.
    * @param {String} message A message that is human readable.
@@ -1483,15 +1482,15 @@ var DocumentOutlineView = function documentOutlineView(outline) {
 document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
   PDFView.initialize();
 
-//#if !(FIREFOX || MOZCENTRAL || CHROME)
+//#if (GENERIC || B2G)
   var params = PDFView.parseQueryString(document.location.search.substring(1));
   var file = params.file || DEFAULT_URL;
-//#else
-//#if CHROME
-//var file = DEFAULT_URL;
-//#else
+//#endif
+//#if (FIREFOX || MOZCENTRAL)
 //var file = window.location.href.split('#')[0];
 //#endif
+//#if CHROME
+//var file = DEFAULT_URL;
 //#endif
 
 //#if CHROME