mash: Merge ChromeLauncherController and *Impl subclass.

chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

 // Copyright 2014 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/app_window_launcher_controller.h"
 
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "ui/wm/public/activation_client.h"
 
 AppWindowLauncherController::AppWindowLauncherController(
-    ChromeLauncherControllerImpl* owner)
+    ChromeLauncherController* owner)
     : owner_(owner) {
   if (ash::Shell::HasInstance()) {
     if (ash::Shell::Get()->GetPrimaryRootWindow()) {
       activation_client_ = aura::client::GetActivationClient(
           ash::Shell::Get()->GetPrimaryRootWindow());
       if (activation_client_)
         activation_client_->AddObserver(this);
     }
   }
 }
@@ skipping 14 matching lines @@
     new_controller->SetActiveWindow(new_active);
     owner_->SetItemStatus(new_controller->shelf_id(), ash::STATUS_ACTIVE);
   }
 
   // Mark the old active window's launcher item as running (if different).
   AppWindowLauncherItemController* old_controller =
       ControllerForWindow(old_active);
   if (old_controller && old_controller != new_controller)
     owner_->SetItemStatus(old_controller->shelf_id(), ash::STATUS_RUNNING);
 }