From dfe68654245fca2fe22aa3796f3ab975750ba407 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Tue, 26 Nov 2013 13:05:25 -0600
Subject: [PATCH] Bug 943372 - Use the newer remote-browser webNavigation jsm
 in metrofx front end. r=mbrubeck

---
 browser/metro/base/content/bindings/browser.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/browser/metro/base/content/bindings/browser.xml b/browser/metro/base/content/bindings/browser.xml
index 91b124166402..a5409de71c9a 100644
--- a/browser/metro/base/content/bindings/browser.xml
+++ b/browser/metro/base/content/bindings/browser.xml
@@ -798,9 +798,19 @@
                 onget="return this._contentTitle;"
                 readonly="true"/>
 
-      <property name="webNavigation"
-                onget="return this._remoteWebNavigation;"
-                readonly="true"/>
+      <field name="_remoteWebNavigation">null</field>
+      <property name="webNavigation" readonly="true">
+        <getter>
+          <![CDATA[
+            if (!this._remoteWebNavigation) {
+              let jsm = "resource://gre/modules/RemoteWebNavigation.jsm";
+              let RemoteWebNavigation = Components.utils.import(jsm, {}).RemoteWebNavigation;
+              this._remoteWebNavigation = new RemoteWebNavigation(this);
+            }
+            return this._remoteWebNavigation;
+          ]]>
+        </getter>
+      </property>
 
       <property name="contentWindow"
                 readonly="true"