Revert 267354 "Refactor views app list services to allow more co..."

trunk/src/chrome/browser/ui/views/app_list/win/activation_tracker_win.cc

Index: trunk/src/chrome/browser/ui/views/app_list/win/activation_tracker_win.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/win/activation_tracker_win.cc	(revision 267382)
+++ trunk/src/chrome/browser/ui/views/app_list/win/activation_tracker_win.cc	(working copy)
@@ -5,8 +5,6 @@
 #include "chrome/browser/ui/views/app_list/win/activation_tracker_win.h"
 
 #include "base/time/time.h"
-#include "chrome/browser/ui/app_list/app_list_shower_views.h"
-#include "chrome/browser/ui/views/app_list/win/app_list_service_win.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/views/widget/widget.h"
 
@@ -18,15 +16,17 @@
 
 }  // namespace
 
-ActivationTrackerWin::ActivationTrackerWin(AppListServiceWin* service)
-    : service_(service),
+ActivationTrackerWin::ActivationTrackerWin(
+    app_list::AppListView* view,
+    const base::Closure& on_should_dismiss)
+    : view_(view),
+      on_should_dismiss_(on_should_dismiss),
       taskbar_has_focus_(false) {
-  service_->shower().app_list()->AddObserver(this);
+  view_->AddObserver(this);
 }
 
 ActivationTrackerWin::~ActivationTrackerWin() {
-  DCHECK(service_->shower().app_list());
-  service_->shower().app_list()->RemoveObserver(this);
+  view_->RemoveObserver(this);
   timer_.Stop();
 }
 
@@ -51,7 +51,7 @@
   if (!ShouldDismissAppList())
     return;
 
-  service_->DismissAppList();
+  on_should_dismiss_.Run();
 }
 
 bool ActivationTrackerWin::ShouldDismissAppList() {
@@ -92,8 +92,7 @@
   while (focused_hwnd) {
     // If the focused window is the right click menu (called a jump list) or
     // the app list, don't hide the launcher.
-    HWND app_list_hwnd = service_->shower().app_list()->GetHWND();
-    if (focused_hwnd == jump_list_hwnd || focused_hwnd == app_list_hwnd)
+    if (focused_hwnd == jump_list_hwnd || focused_hwnd == view_->GetHWND())
       return false;
 
     if (focused_hwnd == taskbar_hwnd) {