summaryrefslogtreecommitdiffstats
path: root/android_webview/tools
diff options
context:
space:
mode:
authoryolandyan <yolandyan@google.com>2015-11-17 16:11:41 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-18 00:12:18 +0000
commitffa5a6c31ae549d298e51e3f3d8175b4fb07e5b7 (patch)
tree71f9fda1caaf4be079cad7e3642f132bee9c5803 /android_webview/tools
parent30b6df3a71911803dd6dc6e9764c353dfd2bc039 (diff)
downloadchromium_src-ffa5a6c31ae549d298e51e3f3d8175b4fb07e5b7.zip
chromium_src-ffa5a6c31ae549d298e51e3f3d8175b4fb07e5b7.tar.gz
chromium_src-ffa5a6c31ae549d298e51e3f3d8175b4fb07e5b7.tar.bz2
Change user agent in TelemetryActivity in system webview shell for
perf testing with Extra String that comes with the intent This is to fix one of the issues in android_webview_aosp_perf. Android WebView doesn't support "--user-agent" commandline flag and it causing some of the pages to reload in Telemetry tests. BUG=554430 Review URL: https://codereview.chromium.org/1433193002 Cr-Commit-Position: refs/heads/master@{#360219}
Diffstat (limited to 'android_webview/tools')
-rw-r--r--android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java
index 11fa10b..fc50f24 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java
+++ b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java
@@ -5,8 +5,10 @@
package org.chromium.webview_shell;
import android.app.Activity;
+import android.content.Intent;
import android.os.Bundle;
import android.webkit.CookieManager;
+import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
@@ -24,7 +26,14 @@ public class TelemetryActivity extends Activity {
WebView webView = (WebView) findViewById(R.id.webview);
CookieManager.setAcceptFileSchemeCookies(true);
- webView.getSettings().setJavaScriptEnabled(true);
+ WebSettings settings = webView.getSettings();
+ settings.setJavaScriptEnabled(true);
+
+ Intent intent = getIntent();
+ String userAgentString = intent.getStringExtra("userAgent");
+ if (userAgentString != null) {
+ settings.setUserAgentString(userAgentString);
+ }
webView.setWebViewClient(new WebViewClient() {
@Override