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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114687 0039d316-1c4b-4281-b951-d872f2087c98

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 24c5a14..3928b81 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"
@@ -203,7 +204,12 @@ void CapsLockMenuButton::MaybeShowBubble() {
       // Don't show the bubble when Caps Lock key is available.
       HasCapsLock() ||
       // Don't show it when the status area is hidden.
-      (parent() && !parent()->visible()))
+      (parent() && !parent()->visible()) ||
+      // 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_;