summaryrefslogtreecommitdiffstats
path: root/ash/system/tray_caps_lock.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 01:01:24 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 01:01:24 +0000
commitaaf986f6afcb79cc006ad6ea192da4299b52ee92 (patch)
tree1c9973ce6efe673a412734dcbc0c8d49ca563201 /ash/system/tray_caps_lock.h
parent65cebbc3d0c387606d4e145818fc050922e7acd9 (diff)
downloadchromium_src-aaf986f6afcb79cc006ad6ea192da4299b52ee92.zip
chromium_src-aaf986f6afcb79cc006ad6ea192da4299b52ee92.tar.gz
chromium_src-aaf986f6afcb79cc006ad6ea192da4299b52ee92.tar.bz2
ash: Show the bubble for caps lock.
BUG=118859 TEST=none Review URL: https://chromiumcodereview.appspot.com/9795005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray_caps_lock.h')
-rw-r--r--ash/system/tray_caps_lock.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/ash/system/tray_caps_lock.h b/ash/system/tray_caps_lock.h
index 0a0ab3c..eba50c6 100644
--- a/ash/system/tray_caps_lock.h
+++ b/ash/system/tray_caps_lock.h
@@ -10,6 +10,7 @@
namespace views {
class ImageView;
+class View;
}
namespace ash {
@@ -18,7 +19,8 @@ class ASH_EXPORT CapsLockObserver {
public:
virtual ~CapsLockObserver() {}
- virtual void OnCapsLockChanged(bool enabled) = 0;
+ virtual void OnCapsLockChanged(bool enabled,
+ int string_id) = 0;
};
namespace internal {
@@ -32,9 +34,15 @@ class TrayCapsLock : public TrayImageItem,
private:
// Overridden from TrayImageItem.
virtual bool GetInitialVisibility() OVERRIDE;
+ virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
+ virtual void DestroyDetailedView() OVERRIDE;
// Overridden from CapsLockObserver.
- virtual void OnCapsLockChanged(bool enabled) OVERRIDE;
+ virtual void OnCapsLockChanged(bool enabled,
+ int string_id) OVERRIDE;
+
+ scoped_ptr<views::View> detailed_;
+ int string_id_; // String ID for the string to show in the popup.
DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
};