diff options
| author | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:20:02 +0000 |
|---|---|---|
| committer | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:20:02 +0000 |
| commit | 0ea3726128e3865dafd320acd4cf335a1fcba43d (patch) | |
| tree | c4a7aae6ae5f7a63a4eca4008f7226b0775c3e52 | |
| parent | d5ad71c610e08e0d4e2cb47e137974d7932576a5 (diff) | |
| download | chromium_src-0ea3726128e3865dafd320acd4cf335a1fcba43d.zip chromium_src-0ea3726128e3865dafd320acd4cf335a1fcba43d.tar.gz chromium_src-0ea3726128e3865dafd320acd4cf335a1fcba43d.tar.bz2 | |
Rename ATTR_LINK_TARGET to ATTR_URL and assign it within webaccessibility.BUG=noneTEST=none
Review URL: http://codereview.chromium.org/5698002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69751 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/accessibility/browser_accessibility_cocoa.mm | 2 | ||||
| -rw-r--r-- | webkit/glue/webaccessibility.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webaccessibility.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm index 77ca8b4..a86a0bb 100644 --- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm @@ -256,7 +256,7 @@ bool GetState(BrowserAccessibility* accessibility, int state) { WebAccessibility::Attribute urlAttribute = [[self role] isEqualToString:@"AXWebArea"] ? WebAccessibility::ATTR_DOC_URL : - WebAccessibility::ATTR_LINK_TARGET; + WebAccessibility::ATTR_URL; return NSStringForWebAccessibilityAttribute( browserAccessibility_->attributes(), urlAttribute); diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index 0888a62..c3ef261 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -324,6 +324,8 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, attributes[ATTR_SHORTCUT] = src.keyboardShortcut(); if (src.hasComputedStyle()) attributes[ATTR_DISPLAY] = src.computedStyleDisplay(); + if (!src.url().isEmpty()) + attributes[ATTR_URL] = src.url().spec().utf16(); WebKit::WebNode node = src.node(); diff --git a/webkit/glue/webaccessibility.h b/webkit/glue/webaccessibility.h index a8e4b11..c073502 100644 --- a/webkit/glue/webaccessibility.h +++ b/webkit/glue/webaccessibility.h @@ -175,8 +175,8 @@ struct WebAccessibility { ATTR_DISPLAY, ATTR_HELP, ATTR_HTML_TAG, - ATTR_LINK_TARGET, ATTR_SHORTCUT, + ATTR_URL, NUM_ATTRIBUTES }; |