diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 23:50:23 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 23:50:23 +0000 |
| commit | 0cd768ecf392756b92869d4c54a0b280677f0265 (patch) | |
| tree | c1f4d8985b7d20b4abac23391640af688733fab9 /ash/shelf/shelf_view.cc | |
| parent | 1dbb7cf0d8419c72687f19813878263fe4de35c2 (diff) | |
| download | chromium_src-0cd768ecf392756b92869d4c54a0b280677f0265.zip chromium_src-0cd768ecf392756b92869d4c54a0b280677f0265.tar.gz chromium_src-0cd768ecf392756b92869d4c54a0b280677f0265.tar.bz2 | |
Upon activation on mixed mode, we only show and use apps of the current user. Furthermore we should not show the menu if an app was created.
BUG=296269
TEST=visual
Review URL: https://codereview.chromium.org/58813002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_view.cc')
| -rw-r--r-- | ash/shelf/shelf_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index fcd27ff..86ddc6c 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -1672,9 +1672,8 @@ void ShelfView::ButtonPressed(views::Button* sender, const ui::Event& event) { LauncherItemDelegate* item_delegate = item_manager_->GetLauncherItemDelegate( model_->items()[view_index].id); - item_delegate->ItemSelected(event); - - ShowListMenuForView(model_->items()[view_index], sender, event); + if (!item_delegate->ItemSelected(event)) + ShowListMenuForView(model_->items()[view_index], sender, event); } } |