diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 18:23:19 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 18:23:19 +0000 |
| commit | c429cb78d5b6b9a0f020a389e9f621c00e594270 (patch) | |
| tree | cc0490d0317cfb619b398d0c8b37a7023587cd1e | |
| parent | 2c61b07cc4fd80ae526b2e94b7e79c3f0623e96d (diff) | |
| download | chromium_src-c429cb78d5b6b9a0f020a389e9f621c00e594270.zip chromium_src-c429cb78d5b6b9a0f020a389e9f621c00e594270.tar.gz chromium_src-c429cb78d5b6b9a0f020a389e9f621c00e594270.tar.bz2 | |
Merge 114687 - Don't show caps lock notification bubble on lock screen.
BUG=105280
TEST=Lock the screen and enable caps lock. No bubble indicators are shown.
Review URL: http://codereview.chromium.org/8869002
TBR=flackr@chromium.org
Review URL: http://codereview.chromium.org/8970031
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@114829 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/caps_lock_menu_button.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.cc b/chrome/browser/chromeos/status/caps_lock_menu_button.cc index 536d521..27d55fa 100644 --- a/chrome/browser/chromeos/status/caps_lock_menu_button.cc +++ b/chrome/browser/chromeos/status/caps_lock_menu_button.cc @@ -8,6 +8,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" +#include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/status/status_area_bubble.h" #include "chrome/browser/chromeos/system/runtime_environment.h" #include "chrome/browser/chromeos/view_ids.h" @@ -201,7 +202,12 @@ void CapsLockMenuButton::MaybeShowBubble() { // We've already shown the bubble |kMaxBubbleCount| times. !should_show_bubble_ || // Don't show the bubble when Caps Lock key is available. - HasCapsLock()) + HasCapsLock() || + // Don't show the bubble when screen is locked as this results in two + // visible caps lock bubbles (crbug.com/105280). The greater problem of + // displaying bubbles from all caps lock menu buttons regardless of + // visibility is described in crbug.com/106776. + ScreenLocker::default_screen_locker()) return; ++bubble_count_; |