Chromium Code Reviews| Index: content/public/common/content_client.cc |
| diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc |
| index 9558e2ddd700566e0593dbc85c6afe1031c50758..85c94112e4d6681b97bcedda956ac40bb52b8c47 100644 |
| --- a/content/public/common/content_client.cc |
| +++ b/content/public/common/content_client.cc |
| @@ -16,17 +16,9 @@ static ContentClient* g_client; |
| void SetContentClient(ContentClient* client) { |
| g_client = client; |
| - // TODO(dpranke): Doing real work (calling webkit_glue::SetUserAgent) |
| - // inside what looks like a function that initializes a global is a |
| - // bit odd, but we need to make sure this is done before |
| - // webkit_glue::GetUserAgent() is called (so that the UA doesn't change). |
| - // |
| - // It would be cleaner if we could rename this to something like a |
| - // content::Initialize(). Maybe we can merge this into ContentMain() somehow? |
| + // Set the default user agent as provided by the client. |
|
jam
2012/04/06 23:13:52
nit: please keep the "we need to make sure this is
scherkus (not reviewing)
2012/04/06 23:59:41
Done.
|
| if (client) { |
| - bool custom = false; |
| - std::string ua = client->GetUserAgent(&custom); |
| - webkit_glue::SetUserAgent(ua, custom); |
| + webkit_glue::SetUserAgent(client->GetUserAgent(), false); |
| } |
| } |