diff --git a/webapprt/ContentPolicy.js b/webapprt/ContentPolicy.js
new file mode 100644
index 00000000000..8f1c0eb4a08
--- /dev/null
+++ b/webapprt/ContentPolicy.js
@@ -0,0 +1,40 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* We used to use this component to heuristically determine which links to
+ * direct to the user's default browser, but we no longer use that heuristic.
+ * It will come in handy when we implement support for trusted apps, however,
+ * so we left it in (although it is disabled in the manifest).
+*/
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function ContentPolicy() {}
+
+ContentPolicy.prototype = {
+  classID: Components.ID("{75acd178-3d5a-48a7-bd92-fba383520ae6}"),
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]),
+
+  shouldLoad: function(contentType, contentLocation, requestOrigin, context, mimeTypeGuess, extra) {
+
+    return Ci.nsIContentPolicy.ACCEPT;
+
+    // When rejecting a load due to a content policy violation, use this code
+    // to close the window opened by window.open, if any.
+    //if (context.currentURI.spec == "about:blank") {
+    //  context.ownerDocument.defaultView.close();
+    //};
+  },
+
+  shouldProcess: function(contentType, contentLocation, requestOrigin, context, mimeType, extra) {
+    return Ci.nsIContentPolicy.ACCEPT;
+  },
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);
diff --git a/webapprt/components.manifest b/webapprt/components.manifest
index 41f77977f22..d425f0a507a 100644
--- a/webapprt/components.manifest
+++ b/webapprt/components.manifest
@@ -7,6 +7,15 @@ category command-line-handler x-default @mozilla.org/webapprt/clh;1
 component {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4} ContentPermission.js
 contract @mozilla.org/content-permission/prompt;1 {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4}
 
+# ContentPolicy.js
+# We used to use this component to heuristically determine which links to
+# direct to the user's default browser, but we no longer use that heuristic.
+# It will come in handy when we implement support for trusted apps, however,
+# so we left it in (although it is disabled here).
+# component {75acd178-3d5a-48a7-bd92-fba383520ae6} ContentPolicy.js
+# contract @mozilla.org/webapprt/content-policy;1 {75acd178-3d5a-48a7-bd92-fba383520ae6}
+# category content-policy webapprt-content-policy @mozilla.org/webapprt/content-policy;1
+
 # DirectoryProvider.js
 component {e1799fda-4b2f-4457-b671-e0641d95698d} DirectoryProvider.js
 contract @mozilla.org/webapprt/directory-provider;1 {e1799fda-4b2f-4457-b671-e0641d95698d}
diff --git a/webapprt/moz.build b/webapprt/moz.build
index efdebb2a5a8..e98a52a7e4f 100644
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -17,6 +17,7 @@ TEST_DIRS += ['test']
 EXTRA_COMPONENTS += [
     'CommandLineHandler.js',
     'ContentPermission.js',
+    'ContentPolicy.js',
     'DirectoryProvider.js',
     'components.manifest',
 ]