diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:35:50 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:35:50 +0000 |
| commit | d7196e3474c92f1e85c32f98ad564a32604fa535 (patch) | |
| tree | ac137140b97ff1af774775e80e0708c15fa28f6a /webkit/glue/webkit_glue.cc | |
| parent | a65ed542245bbe6089590d06507892a704fb08f0 (diff) | |
| download | chromium_src-d7196e3474c92f1e85c32f98ad564a32604fa535.zip chromium_src-d7196e3474c92f1e85c32f98ad564a32604fa535.tar.gz chromium_src-d7196e3474c92f1e85c32f98ad564a32604fa535.tar.bz2 | |
Removed the GetProductVersion function from webkit_glue and replace it with the BuildUserAgent function.
The BuildUserAgent function has been deleted from user_agent.cc. The implementation of this function
in content\renderer_glue.cc calls the GetUserAgent API in ContentClient which is implemented by the embedder (Chrome).
Added implementations of the BuildUserAgent function for test_shell and DumpRenderTree. To build the user agent
string we need the webkit major and minor versions. Added getters for them in the webkit_glue namespace in the
user_agent.h/.cc files.
This helps reduce the implicit dependency of content on chrome.
BUG=82454
Review URL: http://codereview.chromium.org/7166004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 6e43e8b88..3c86c58 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -356,7 +356,7 @@ static base::LazyInstance<UserAgentState> g_user_agent( base::LINKER_INITIALIZED); void SetUserAgentToDefault() { - BuildUserAgent(false, &g_user_agent.Get().user_agent); + g_user_agent.Get().user_agent = BuildUserAgent(false); } } // namespace @@ -383,7 +383,7 @@ const std::string& GetUserAgent(const GURL& url) { // http://bugs.chromium.org/11136 // TODO(evanm): remove this if Yahoo fixes their sniffing. if (g_user_agent.Get().mimic_windows_user_agent.empty()) - BuildUserAgent(true, &g_user_agent.Get().mimic_windows_user_agent); + g_user_agent.Get().mimic_windows_user_agent = BuildUserAgent(true); return g_user_agent.Get().mimic_windows_user_agent; } #endif |