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

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 274 matching lines @@
   // No context menus when screen is locked.
   if (session_state_delegate_->IsScreenLocked())
     return;
 
   aura::Window* root =
       wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size()));
   GetRootWindowController(root)
       ->ShowContextMenu(location_in_screen, source_type);
 }
 
-void Shell::ToggleAppList(aura::Window* window) {
+void Shell::ShowAppList(aura::Window* window) {
   // If the context window is not given, show it on the target root window.
   if (!window)
     window = GetTargetRootWindow();
   if (!app_list_controller_)
     app_list_controller_.reset(new AppListController);
-  app_list_controller_->SetVisible(!app_list_controller_->IsVisible(), window);
+  app_list_controller_->SetVisible(true, window);
+}
+
+void Shell::DismissAppList() {
+  if (!app_list_controller_)
+    return;
+  app_list_controller_->SetVisible(false, GetTargetRootWindow());

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

Are you sure this is equivalent? i.e., does AppListController::SetVisible()
ignore its second argument if its first argument is false?

If not, then you are changing the behaviour here when ToggleAppList was called
with a non-NULL window when the window is already visible.

Having said that, the only instance I can find of ToggleAppList with a non-NULL
window is the test I wrote, which always uses it to show the app list, so this
is probably fine. Just making sure you thought about it.

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

I checked the method definition and it looks fine. I also plan to split
SetVisible into 2 methods next CL.

[Matt Giuca, 2014/08/14 05:05:36]

Acknowledged.

 }
 
 bool Shell::GetAppListTargetVisibility() const {
   return app_list_controller_.get() &&
       app_list_controller_->GetTargetVisibility();
 }
 
 aura::Window* Shell::GetAppListWindow() {
   return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
 }
@@ skipping 824 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash