content/child/npapi/plugin_host.cc - Issue 191093002: Simplify the user agent code some more since after r255534 it's not affected by the site's URL.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 191093002: Simplify the user agent code some more since after r255534 it's not affected by the site's URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: patchset 15 which works 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

Index: content/child/npapi/plugin_host.cc

===================================================================

--- content/child/npapi/plugin_host.cc (revision 255867)

+++ content/child/npapi/plugin_host.cc (working copy)

@@ -17,6 +17,7 @@

#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"

@@ -25,7 +26,6 @@

#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 webkit_glue::GetUserAgent(GURL()).c_str();

+ return content::GetContentClient()->GetUserAgent().c_str();

}

void NPN_Status(NPP id, const char* message) {

« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »