mash: Merge ChromeLauncherController and *Impl subclass.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace extensions {
 class AppWindow;
 }
 
-class ChromeLauncherControllerImpl;
+class ChromeLauncherController;
 class Profile;
 class ExtensionAppWindowLauncherItemController;
 
 // AppWindowLauncherController observes the app window registry and the
 // aura window manager. It handles adding and removing launcher items from
-// ChromeLauncherControllerImpl.
+// ChromeLauncherController.
 class ExtensionAppWindowLauncherController
     : public AppWindowLauncherController,
       public extensions::AppWindowRegistry::Observer,
       public aura::WindowObserver {
  public:
   explicit ExtensionAppWindowLauncherController(
-      ChromeLauncherControllerImpl* owner);
+      ChromeLauncherController* owner);
   ~ExtensionAppWindowLauncherController() override;
 
   // AppWindowLauncherController:
   void AdditionalUserAddedToSession(Profile* profile) override;
   AppWindowLauncherItemController* ControllerForWindow(
       aura::Window* window) override;
 
   // Overridden from AppWindowRegistry::Observer:
   void OnAppWindowIconChanged(extensions::AppWindow* app_window) override;
   void OnAppWindowShown(extensions::AppWindow* app_window,
@@ skipping 26 matching lines @@
   // Map of app launcher id to controller.
   AppControllerMap app_controller_map_;
 
   // Allows us to get from an aura::Window to the app shelf id.
   WindowToAppShelfIdMap window_to_app_shelf_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_