Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/child/npapi/plugin_host.cc

Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/child/blink_platform_impl.cc ('k') | trunk/src/content/public/common/content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/child/npapi/plugin_host.cc
===================================================================
--- trunk/src/content/child/npapi/plugin_host.cc (revision 255866)
+++ trunk/src/content/child/npapi/plugin_host.cc (working copy)
@@ -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 @@
"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) {
« no previous file with comments | « trunk/src/content/child/blink_platform_impl.cc ('k') | trunk/src/content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698