summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 16:11:54 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 16:11:54 +0000
commitbd884e88323771fb7ce66851bb2907569b46763d (patch)
treed83154f0d1eec83886bfa97d838ba36b1cdbab30
parent469006ca33c230e7e815150a2ae0cf8dd46c91cd (diff)
downloadchromium_src-bd884e88323771fb7ce66851bb2907569b46763d.zip
chromium_src-bd884e88323771fb7ce66851bb2907569b46763d.tar.gz
chromium_src-bd884e88323771fb7ce66851bb2907569b46763d.tar.bz2
Add test_shell support for enabling hyperlink auditing
BUG=none TEST=http/tests/navigation/ping-* pass Review URL: http://codereview.chromium.org/3412029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60473 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/webpreferences.cc1
-rw-r--r--webkit/glue/webpreferences.h2
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
3 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 4dcb800..379ceb7 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -59,6 +59,7 @@ void WebPreferences::Apply(WebView* web_view) const {
WebRuntimeFeatures::enableDatabase(
WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled);
settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
+ settings->setHyperlinkAuditingEnabled(hyperlink_auditing_enabled);
// This setting affects the behavior of links in an editable region:
// clicking the link should select it rather than navigate to it.
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index c2ce504..8b2d85d 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -55,6 +55,7 @@ struct WebPreferences {
bool databases_enabled;
bool application_cache_enabled;
bool tabs_to_links;
+ bool hyperlink_auditing_enabled;
bool user_style_sheet_enabled;
GURL user_style_sheet_location;
@@ -103,6 +104,7 @@ struct WebPreferences {
databases_enabled(false),
application_cache_enabled(false),
tabs_to_links(true),
+ hyperlink_auditing_enabled(false),
user_style_sheet_enabled(false),
author_and_user_styles_enabled(true),
allow_universal_access_from_file_urls(false),
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index feff62d..50ec183 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -1210,6 +1210,8 @@ void LayoutTestController::overridePreference(
preferences->tabs_to_links = CppVariantToBool(value);
else if (key == "WebKitWebGLEnabled")
preferences->experimental_webgl_enabled = CppVariantToBool(value);
+ else if (key == "WebKitHyperlinkAuditingEnabled")
+ preferences->hyperlink_auditing_enabled = CppVariantToBool(value);
else {
std::string message("Invalid name for preference: ");
message.append(key);