diff options
author | Ben Murdoch <benm@google.com> | 2014-10-29 14:53:36 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-10-29 14:53:36 +0000 |
commit | ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 (patch) | |
tree | 15b4406dfa6b28391b19bcf760f1aeb04d13898a /chrome/browser/signin/screenlock_bridge.h | |
parent | 93b3e633be4a0f65c62fca1805fd44021e04beaa (diff) | |
download | chromium_org-ab8f6f0bd665d3c1ff476eb06c58c42630e462d4.tar.gz |
Merge from Chromium at DEPS revision 39.0.2171.44
This commit was generated by merge_to_master.py.
Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
Diffstat (limited to 'chrome/browser/signin/screenlock_bridge.h')
-rw-r--r-- | chrome/browser/signin/screenlock_bridge.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/signin/screenlock_bridge.h b/chrome/browser/signin/screenlock_bridge.h index 7add894433..c9b702db85 100644 --- a/chrome/browser/signin/screenlock_bridge.h +++ b/chrome/browser/signin/screenlock_bridge.h @@ -64,6 +64,10 @@ class ScreenlockBridge { // shown with the icon. void SetTooltip(const base::string16& tooltip, bool autoshow); + // Sets the accessiblity label of the icon. If this attribute is not + // provided, then the tooltip will be used. + void SetAriaLabel(const base::string16& aria_label); + // If hardlock on click is set, clicking the icon in the screenlock will // go to state where password is required for unlock. void SetHardlockOnClick(); @@ -74,6 +78,8 @@ class ScreenlockBridge { base::string16 tooltip_; bool autoshow_tooltip_; + base::string16 aria_label_; + bool hardlock_on_click_; DISALLOW_COPY_AND_ASSIGN(UserPodCustomIconOptions); |