diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 09:13:34 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 09:13:34 +0000 |
| commit | 2d5115433d38fa4f1e70cb7f3164cdb4d26624e2 (patch) | |
| tree | 6e4ef250b395c77066db1dc83c47b081f5abb0b7 /ash/system | |
| parent | 44540c2bf35120dd3486898ea43ce5cc9fc6089f (diff) | |
| download | chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.zip chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.tar.gz chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.tar.bz2 | |
Activate the status area only when it's focused using the keyboard.
ash/status_area/status_area_view.cc:
chrome/browser/chromeos/status/status_area_view.cc:
Override views::WidgetDelegate::CanActivate. Return false unless the area is focused using the keyboard.
ash/system/tray/system_tray.cc:
Handle a mouse event correctly.
ash/wm/activation_controller.cc:
Change the order of kWindowContainerIds[] so that a browser window gets focused when a window in SettingBubbleContainer is closed.
This fix is similar to http://crrev.com/122459 (by sky).
BUG=115815
TEST=aura_shell_unittests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=125323
Review URL: https://chromiumcodereview.appspot.com/9570013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 192062c..d45b9bd 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -348,7 +348,7 @@ void SystemTray::ShowItems(std::vector<SystemTrayItem*>& items, bool detailed) { bool SystemTray::OnMousePressed(const views::MouseEvent& event) { if (popup_) - popup_->Show(); + popup_->Hide(); else ShowItems(items_, false); return true; |