mash: Merge ChromeLauncherController and *Impl subclass.

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

 // 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.
 
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 
 #include "ash/shelf/shelf_model.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_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/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_throbber.h"
 
 namespace {
 
 constexpr int kUpdateIconIntervalMs = 40;  // 40ms for 25 frames per second.
 constexpr int kSpinningGapPercent = 25;
 
@@ skipping 27 matching lines @@
  private:
   base::WeakPtr<ArcAppDeferredLauncherController> host_;
   const std::string shelf_app_id_;
   const gfx::ImageSkia image_;
 
   DISALLOW_COPY_AND_ASSIGN(SpinningEffectSource);
 };
 }  // namespace
 
 ArcAppDeferredLauncherController::ArcAppDeferredLauncherController(
-    ChromeLauncherControllerImpl* owner)
+    ChromeLauncherController* owner)
     : owner_(owner), weak_ptr_factory_(this) {
   if (arc::IsArcAllowedForProfile(owner->profile())) {
     observed_profile_ = owner->profile();
     ArcAppListPrefs::Get(observed_profile_)->AddObserver(this);
   }
   arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
   // arc::ArcSessionManager might not be set in tests.
   if (arc_session_manager)
     arc_session_manager->AddObserver(this);
 }
@@ skipping 140 matching lines @@
     owner_->shelf_model()->SetShelfItemDelegate(shelf_id,
                                                 std::move(controller));
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[shelf_app_id] = item_controller;
 }