diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:30:12 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:30:12 +0000 |
| commit | 8676f04721b1a08e3ac16b3d33737e7d8706b402 (patch) | |
| tree | da7af576aae72bb1ea3a662ba07544bbac1df5b4 /ash/system | |
| parent | 72a22eb913ab85b47971038acc7ca7117a96d633 (diff) | |
| download | chromium_src-8676f04721b1a08e3ac16b3d33737e7d8706b402.zip chromium_src-8676f04721b1a08e3ac16b3d33737e7d8706b402.tar.gz chromium_src-8676f04721b1a08e3ac16b3d33737e7d8706b402.tar.bz2 | |
Makes the shelf visible if the launcher/status has focus.
BUG=120706
TEST=see bug, also covered by unit tests
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9890001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index c33fe5a..e4b1e04 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -553,6 +553,10 @@ void SystemTray::ShowItems(std::vector<SystemTrayItem*>& items, bubble_ = new internal::SystemTrayBubble(this, container_, items, detailed); bubble_->set_can_activate(activate); popup_ = views::BubbleDelegateView::CreateBubble(bubble_); + // If we have focus the shelf should be visible and we need to continue + // showing the shelf when the popup is shown. + if (GetWidget()->IsActive()) + should_show_launcher_ = true; bubble_->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); popup_->non_client_view()->frame_view()->set_background(NULL); popup_->non_client_view()->frame_view()->set_border( |