Split Shell::ToggleAppList() into ShowAppList and DismissAppList.

ash/shelf/app_list_shelf_item_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ash {
 
 AppListShelfItemDelegate::AppListShelfItemDelegate() {
   ShelfItem app_list;
   app_list.type = TYPE_APP_LIST;
   Shell::GetInstance()->shelf_model()->Add(app_list);
 }
 
 AppListShelfItemDelegate::~AppListShelfItemDelegate() {
   // ShelfItemDelegateManager owns and destroys this class.
 }
 
 bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) {
   // Pass NULL here to show the app list in the currently active RootWindow.
-  Shell::GetInstance()->ToggleAppList(NULL);
+  if (Shell::GetInstance()->GetAppListTargetVisibility())

[Matt Giuca, 2014/08/14 04:17:07]

... here's the second one.

[calamity, 2014/08/14 05:00:59]

Done.

+    Shell::GetInstance()->DismissAppList();
+  else
+    Shell::GetInstance()->ShowAppList(NULL);
   return false;
 }
 
 base::string16 AppListShelfItemDelegate::GetTitle() {
   ShelfModel* model = Shell::GetInstance()->shelf_model();
   DCHECK(model);
   return model->status() == ShelfModel::STATUS_LOADING ?
       l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE) :
       l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE);
 }
@@ skipping 16 matching lines @@
 }
 
 bool AppListShelfItemDelegate::ShouldShowTooltip() {
   return true;
 }
 
 void AppListShelfItemDelegate::Close() {
 }
 
 }  // namespace ash