Remove PerBrowser launcher, reland step 1 of 2

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 "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "ash/wm/window_properties.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"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/views/corewm/window_animations.h"
 
 using apps::ShellWindow;
 
@@ skipping 124 matching lines @@
     aura::Window* panel_window = panel->GetNativeWindow();
     // If the panel is attached on another display, move it to the current
     // display and activate it.
     if (panel_window->GetProperty(ash::internal::kPanelAttachedKey) &&
         ash::wm::MoveWindowToEventRoot(panel_window, event)) {
       if (!panel->GetBaseWindow()->IsActive())
         ShowAndActivateOrMinimize(panel);
     } else {
       ShowAndActivateOrMinimize(panel);
     }
-  } else if (launcher_controller()->GetPerAppInterface() ||
-      shell_windows_.size() == 1) {
+  } else {
     ShellWindow* window_to_show = last_active_shell_window_ ?
         last_active_shell_window_ : shell_windows_.front();
     // If the event was triggered by a keystroke, we try to advance to the next
     // item if the window we are trying to activate is already active.
     if (shell_windows_.size() >= 1 &&
         window_to_show->GetBaseWindow()->IsActive() &&
         event.type() == ui::ET_KEY_RELEASED) {
       ActivateOrAdvanceToNextShellWindow(window_to_show);
     } else {
       ShowAndActivateOrMinimize(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_)
-      ShowAndActivateOrMinimize(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);
   ShowAndActivateOrMinimize(*it);
 }
 
 ChromeLauncherAppMenuItems
 ShellWindowLauncherItemController::GetApplicationList(int event_flags) {
   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;
     scoped_ptr<gfx::Image> image(shell_window->GetAppListIcon());
     items.push_back(new ChromeLauncherAppMenuItemV2App(
         shell_window->GetTitle(),
         image.get(),  // Will be copied
         app_id(),
-        launcher_controller()->GetPerAppInterface(),
+        launcher_controller(),
         index,
         index == 0 /* has_leading_separator */));
     ++index;
   }
   return items.Pass();
 }
 
 void ShellWindowLauncherItemController::OnWindowPropertyChanged(
     aura::Window* window,
     const void* key,
@@ skipping 33 matching lines @@
   }
   if (window_to_show->GetBaseWindow()->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     ShowAndActivateOrMinimize(window_to_show);
   }
 }