diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 23:54:26 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 23:54:26 +0000 |
commit | f6cda7598ff5c5bdd6b7b91440589fdf2d37eb55 (patch) | |
tree | 157d21e917e2bbc6caeed2e56816cb729eae6472 /webkit/glue/webkit_glue.cc | |
parent | 640517fdd23e08ed95cf129d27457db817ee6124 (diff) | |
download | chromium_src-f6cda7598ff5c5bdd6b7b91440589fdf2d37eb55.zip chromium_src-f6cda7598ff5c5bdd6b7b91440589fdf2d37eb55.tar.gz chromium_src-f6cda7598ff5c5bdd6b7b91440589fdf2d37eb55.tar.bz2 |
Switch to using the message loop rather than gtk_main().
Include more code from the main test_shell.cc into the GTK version. Wherever
possible the code has been copied and pasted in directly to make the future
merge easy.
Review URL: http://codereview.chromium.org/8670
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
-rw-r--r-- | webkit/glue/webkit_glue.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index e59bd68..1c5d0fd 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -403,6 +403,15 @@ void SetUserAgentToDefault() { WEBKIT_VERSION_MAJOR, WEBKIT_VERSION_MINOR ); +#elif defined(OS_LINUX) + // TODO(agl): We don't have version information embedded in files under Linux + // so we use the following string which is based off the UA string for + // Windows. Some solution for embedding the Chrome version number needs to be + // found here. + StringAppendF( + &default_user_agent, + "Mozilla/5.0 (Linux; U; en-US) AppleWebKit/525.13 " + "(KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13"); #else // TODO(port): we need something like FileVersionInfo for our UA string. NOTIMPLEMENTED(); |