Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/browser/chromeos/status/caps_lock_menu_button.cc

Issue 8869002: Don't show caps lock notification bubble on lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/caps_lock_menu_button.cc
diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.cc b/chrome/browser/chromeos/status/caps_lock_menu_button.cc
index 24c5a144d8066f75663dffa2f9aad2d923806bd5..3928b8199f5aced61a606cac0bd8ab5f426e58e8 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_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698