diff options
| author | davemoore <davemoore@chromium.org> | 2015-03-16 13:38:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-16 20:39:16 +0000 |
| commit | a6606dc698030ece6fc3f68e6c670d53c3a90d92 (patch) | |
| tree | 068f039fb44c3d941ad5e634ba70f03d8999f534 /mojo | |
| parent | 12cf57ce97cf1a89a7d0e017389b72cd81807785 (diff) | |
| download | chromium_src-a6606dc698030ece6fc3f68e6c670d53c3a90d92.zip chromium_src-a6606dc698030ece6fc3f68e6c670d53c3a90d92.tar.gz chromium_src-a6606dc698030ece6fc3f68e6c670d53c3a90d92.tar.bz2 | |
Add HTMLViewer command line arg to set user agent
BUG=
Review URL: https://codereview.chromium.org/1008543005
Cr-Commit-Position: refs/heads/master@{#320787}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/blink_platform_impl.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/blink_platform_impl.cc b/mojo/services/html_viewer/blink_platform_impl.cc index 270fc75..bf920d7 100644 --- a/mojo/services/html_viewer/blink_platform_impl.cc +++ b/mojo/services/html_viewer/blink_platform_impl.cc @@ -6,6 +6,7 @@ #include <cmath> +#include "base/command_line.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" @@ -21,10 +22,13 @@ namespace html_viewer { namespace { +// Allows overriding user agent scring. +const char kUserAgentSwitch[] = "user-agent"; + // TODO(darin): Figure out what our UA should really be. -const char kUserAgentString[] = - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) " - "Chrome/35.0.1916.153 Safari/537.36"; +const char kDefaultUserAgentString[] = + "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) " + "Chrome/35.0.1916.153 Safari/537.36"; class WebWaitableEventImpl : public blink::WebWaitableEvent { public: @@ -172,7 +176,12 @@ blink::WebSocketHandle* BlinkPlatformImpl::createWebSocketHandle() { } blink::WebString BlinkPlatformImpl::userAgent() { - return blink::WebString::fromUTF8(kUserAgentString); + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(kUserAgentSwitch)) { + return blink::WebString::fromUTF8( + command_line->GetSwitchValueASCII(kUserAgentSwitch)); + } + return blink::WebString::fromUTF8(kDefaultUserAgentString); } blink::WebData BlinkPlatformImpl::parseDataURL( |