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

Unified Diff: content/public/common/content_client.cc

Issue 186883002: Move user_agent code from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/public/common/content_client.cc
diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc
index 54db51778a46c3fd524de5c5257dff08f8378609..4ed312dd60daabafa361ff15ba00b9bdbf3ce97e 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -6,8 +6,8 @@
#include "base/logging.h"
#include "base/strings/string_piece.h"
+#include "content/public/common/user_agent.h"
#include "ui/gfx/image/image.h"
-#include "webkit/common/user_agent/user_agent.h"
namespace content {
@@ -38,10 +38,10 @@ void SetContentClient(ContentClient* client) {
g_client = client;
// Set the default user agent as provided by the client. We need to make
- // sure this is done before webkit_glue::GetUserAgent() is called (so that
- // the UA doesn't change).
+ // sure this is done before GetUserAgent() is called (so that the UA doesn't
+ // change).
if (client) {
- webkit_glue::SetUserAgent(client->GetUserAgent(), false);
+ SetUserAgent(client->GetUserAgent(), false);
jam 2014/03/04 20:49:45 this isn't needed anymore either since the user ag
tfarina 2014/03/04 22:07:20 Done.
}
}

Powered by Google App Engine
This is Rietveld 408576698