Merge pull request #3400 from gilles-leblanc/issue-3279

Share code between Navigator and WorkerNavigator

1 files changed, 6 insertions, 5 deletions

diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs
index b4a0d98de0c..06b6c90f57b 100644
--- a/components/script/dom/navigator.rs
+++ b/components/script/dom/navigator.rs
@@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
 use dom::bindings::global::Window;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
+use dom::navigatorinfo::NavigatorInfo;
 use dom::window::Window;
 use servo_util::str::DOMString;
 
@@ -32,23 +33,23 @@ impl Navigator {
 
 impl<'a> NavigatorMethods for JSRef<'a, Navigator> {
     fn Product(&self) -> DOMString {
-        "Gecko".to_string()
+        NavigatorInfo::Product()
     }
 
     fn TaintEnabled(&self) -> bool {
-        false
+        NavigatorInfo::TaintEnabled()
     }
 
     fn AppName(&self) -> DOMString {
-        "Netscape".to_string() // Like Gecko/Webkit
+        NavigatorInfo::AppName()
     }
 
     fn AppCodeName(&self) -> DOMString {
-        "Mozilla".to_string()
+        NavigatorInfo::AppCodeName()
     }
 
     fn Platform(&self) -> DOMString {
-        "".to_string()
+        NavigatorInfo::Platform()
     }
 }