ShellWindowLauncherItemController::RestoreOrShow -> ShowAndActivate

ShellWindowLauncherItemController::RestoreOrShow -> ShowAndActivate

Depends on: https://codereview.chromium.org/13007002/

BUG=179387
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190495

[stevenjb, 2013-03-22 21:13:33]

I need to wait for https://codereview.chromium.org/13007002/ to land before I
can try this, but browser_tests and unit_tests pass locally.

[Mr4D (OOO till 08-26), 2013-03-22 23:20:24]

lgtm

[commit-bot: I haz the power, 2013-03-23 19:13:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stevenjb@chromium.org/12674045/2001

[commit-bot: I haz the power, 2013-03-23 19:13:25]

Failed to apply patch for
chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
  Hunk #1 FAILED at 142.
  Hunk #2 FAILED at 156.
  Hunk #3 FAILED at 165.
  Hunk #4 succeeded at 232 (offset 26 lines).
  3 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc.rej

Patch:      
chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
diff --git
a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
index
e1c4ee0b908e1e7b0897bf44ad425a229c780c31..207ae16c04854f5ebc8aa921e2831f0b77ee12ec
100644
--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
@@ -142,7 +142,7 @@ void ShellWindowLauncherItemController::Clicked(const
ui::Event& event) {
       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_ ||
@@ -156,7 +156,7 @@ void ShellWindowLauncherItemController::Clicked(const
ui::Event& event) {
       }
     }
     if (last_active_shell_window_)
-      RestoreOrShow(last_active_shell_window_);
+      ShowAndActivate(last_active_shell_window_);
   }
 }
 
@@ -165,7 +165,7 @@ void
ShellWindowLauncherItemController::ActivateIndexedApp(size_t index) {
     return;
   ShellWindowList::iterator it = shell_windows_.begin();
   std::advance(it, index);
-  RestoreOrShow(*it);
+  ShowAndActivate(*it);
 }
 
 ChromeLauncherAppMenuItems
@@ -206,12 +206,9 @@ void
ShellWindowLauncherItemController::OnWindowPropertyChanged(
   }
 }
 
-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();
 }

[stevenjb, 2013-03-25 22:43:51]

Committed patchset #3 manually as r190495 (presubmit successful).