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

ui/aura_shell/examples/aura_shell_main.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura_shell/examples/toplevel_window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 class AppListWindow : public views::WidgetDelegateView {
@@ skipping 41 matching lines @@
   }
 
   virtual void RequestAppListWidget(
       const gfx::Rect& bounds,
       const SetWidgetCallback& callback) OVERRIDE {
     callback.Run(AppListWindow::Create(bounds));
   }
 
   virtual void LauncherItemClicked(
       const aura_shell::LauncherItem& item) OVERRIDE {
-    aura_shell::ActivateWindow(item.window);
+    item.window->Activate();
   }
 
   virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE {
     static int image_count = 0;
     item->tab_images.resize(image_count + 1);
     for (int i = 0; i < image_count + 1; ++i) {
       item->tab_images[i].image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
       item->tab_images[i].image.allocPixels();
       item->tab_images[i].image.eraseARGB(255,
                                           i == 0 ? 255 : 0,
@@ skipping 36 matching lines @@
   aura::RootWindow::GetInstance()->Run();
 
   aura_shell::Shell::DeleteInstance();
 
   aura::RootWindow::DeleteInstance();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }