Revert 114095 - Move the concept of Activation to the Shell.

chrome/browser/ui/views/aura/chrome_shell_delegate.cc

 // Copyright (c) 2011 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/views/aura/chrome_shell_delegate.h"
 
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/aura/app_list_window.h"
 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
-#include "ui/aura_shell/window_util.h"
 
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate() {
   instance_ = this;
 }
 
 ChromeShellDelegate::~ChromeShellDelegate() {
   if (instance_ == this)
@@ skipping 35 matching lines @@
 
 void ChromeShellDelegate::RequestAppListWidget(
     const gfx::Rect& bounds,
     const SetWidgetCallback& callback) {
   // AppListWindow deletes itself when closed.
   new AppListWindow(bounds, callback);
 }
 
 void ChromeShellDelegate::LauncherItemClicked(
     const aura_shell::LauncherItem& item) {
-  aura_shell::ActivateWindow(item.window);
+  item.window->Activate();
 }
 
 bool ChromeShellDelegate::ConfigureLauncherItem(
     aura_shell::LauncherItem* item) {
   BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window);
   return view &&
       ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
 }