diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 20:10:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 20:10:41 +0000 |
| commit | 69078b8d2c607abde0fdedb08930598438e25f5f (patch) | |
| tree | 16369fd439f1630837aa767cc4ce5ceb8f31f233 /content/child/npapi | |
| parent | 8a820c8276581a82f263c7e3603ab4bc73a221db (diff) | |
| download | chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.zip chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.gz chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.bz2 | |
Revert 255858 "Simplify the user agent code some more since afte..."
There are some browser_tests failures on the buildbots that don't reproduce locally. Reverting while I investigate.
> Simplify the user agent code some more since after r255534 it's not affected by the site's URL.
>
> Code in content always gets it now from ContentClient::GetUserAgent. In Chrome, there's a GetUserAgent function which returns it.
>
> BUG=338338
> R=isherman@chromium.org, pauljensen@chromium.org, scottmg@chromium.org, tfarina@chromium.org
>
> Review URL: https://codereview.chromium.org/191093002
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/192283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/npapi')
| -rw-r--r-- | content/child/npapi/plugin_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/child/npapi/plugin_host.cc b/content/child/npapi/plugin_host.cc index 7d98ba5..e0ac05d 100644 --- a/content/child/npapi/plugin_host.cc +++ b/content/child/npapi/plugin_host.cc @@ -17,7 +17,6 @@ #include "content/child/npapi/plugin_lib.h" #include "content/child/npapi/plugin_stream_url.h" #include "content/child/npapi/webplugin_delegate.h" -#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/webplugininfo.h" #include "net/base/net_util.h" @@ -26,6 +25,7 @@ #include "third_party/npapi/bindings/npruntime.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" +#include "webkit/common/user_agent/user_agent.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -598,7 +598,7 @@ const char* NPN_UserAgent(NPP id) { "Gecko/20061103 Firefox/2.0a1"; #endif - return content::GetContentClient()->GetUserAgent().c_str(); + return webkit_glue::GetUserAgent(GURL()).c_str(); } void NPN_Status(NPP id, const char* message) { |