ShellWindowLauncherItemController::RestoreOrShow -> ShowAndActivate

chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.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 "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h"
 
 #include "ash/launcher/launcher_util.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
@@ skipping 124 matching lines @@
   }
 }
 
 void ShellWindowLauncherItemController::Clicked(const ui::Event& event) {
   if (shell_windows_.empty())
     return;
   if (launcher_controller()->GetPerAppInterface() ||
       shell_windows_.size() == 1) {
     ShellWindow* window_to_show = last_active_shell_window_ ?
         last_active_shell_window_ : shell_windows_.front();
-    RestoreOrShow(window_to_show);
+    ShowAndActivate(window_to_show);
   } else {
     // TODO(stevenjb): Deprecate
     if (!last_active_shell_window_ ||
         last_active_shell_window_->GetBaseWindow()->IsActive()) {
       // Restore all windows since there is no other way to restore them.
       for (ShellWindowList::iterator iter = shell_windows_.begin();
            iter != shell_windows_.end(); ++iter) {
         ShellWindow* shell_window = *iter;
         if (shell_window->GetBaseWindow()->IsMinimized())
           shell_window->GetBaseWindow()->Restore();
       }
     }
     if (last_active_shell_window_)
-      RestoreOrShow(last_active_shell_window_);
+      ShowAndActivate(last_active_shell_window_);
   }
 }
 
 void ShellWindowLauncherItemController::ActivateIndexedApp(size_t index) {
   if (index >= shell_windows_.size())
     return;
   ShellWindowList::iterator it = shell_windows_.begin();
   std::advance(it, index);
-  RestoreOrShow(*it);
+  ShowAndActivate(*it);
 }
 
 ChromeLauncherAppMenuItems
 ShellWindowLauncherItemController::GetApplicationList() {
   ChromeLauncherAppMenuItems items;
   items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false));
   int index = 0;
   for (ShellWindowList::iterator iter = shell_windows_.begin();
        iter != shell_windows_.end(); ++iter) {
     ShellWindow* shell_window = *iter;
@@ skipping 20 matching lines @@
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
     } else {
       status = ash::STATUS_RUNNING;
     }
     launcher_controller()->SetItemStatus(launcher_id(), status);
   }
 }
 
-void ShellWindowLauncherItemController::RestoreOrShow(
+void ShellWindowLauncherItemController::ShowAndActivate(
     ShellWindow* shell_window) {
-  if (shell_window->GetBaseWindow()->IsMinimized())
-    shell_window->GetBaseWindow()->Restore();
-  else
-    shell_window->GetBaseWindow()->Show();
   // Always activate windows when shown from the launcher.
+  shell_window->GetBaseWindow()->Show();
   shell_window->GetBaseWindow()->Activate();
 }