commit 2959916b13165f56431f3993bd6b16364032af14
author John Reck <jreck@google.com> Tue May 24 11:03:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 24 11:03:11 2011 -0700
tree 84e1e02ef4483fd887ae48f03140e9ee6f7b9806
parent ef89cc14957ab631346564801841190346632ac9
parent 5443ba43bb55c1a3e6ed846d8b5e5b5aac7dbeb4

Merge "Update the Desktop UA to Chrome" into honeycomb-mr2

core/java/android/webkit/WebSettings.java

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 77eff79..b884853 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -360,10 +360,9 @@
     }
 
     // User agent strings.
-    private static final String DESKTOP_USERAGENT =
-            "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us)"
-            + " AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0"
-            + " Safari/530.17";
+    private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (X11; " +
+        "Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) " +
+        "Chrome/11.0.696.34 Safari/534.24";
     private static final String IPHONE_USERAGENT =
             "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us)"
             + " AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0"