Adding ChromeLauncherController interface.

chrome/browser/ui/ash/launcher/arc_app_window_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_window_launcher_controller.h"
 
 #include "ash/common/wm/window_state.h"
+#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.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_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ skipping 162 matching lines @@
   // Unowned pointers
   ArcAppWindowLauncherController* owner_;
   ArcAppWindowLauncherItemController* controller_ = nullptr;
   // Unowned pointer, represents host Arc window.
   views::Widget* widget_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindow);
 };
 
 ArcAppWindowLauncherController::ArcAppWindowLauncherController(
-    ChromeLauncherController* owner)
-    : AppWindowLauncherController(owner) {
-  if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {
-    observed_profile_ = owner->profile();
+    ChromeLauncherController* owner,
+    ash::ShelfDelegate* shelf_delegate)
+    : AppWindowLauncherController(owner), shelf_delegate_(shelf_delegate) {
+  if (arc::ArcAuthService::IsAllowedForProfile(owner->GetProfile())) {
+    observed_profile_ = owner->GetProfile();
     StartObserving(observed_profile_);
   }
 }
 
 ArcAppWindowLauncherController::~ArcAppWindowLauncherController() {
   if (observed_profile_)
     StopObserving(observed_profile_);
 }
 
 void ArcAppWindowLauncherController::ActiveUserChanged(
@@ skipping 124 matching lines @@
   if (it == task_id_to_app_window_.end())
     return;
 
   AppWindow* app_window = it->second.get();
   UnregisterApp(app_window);
 
   task_id_to_app_window_.erase(it);
 }
 
 void ArcAppWindowLauncherController::OnTaskSetActive(int32_t task_id) {
-  if (observed_profile_ != owner()->profile())
+  if (observed_profile_ != owner()->GetProfile())
     return;
 
   TaskIdToAppWindow::iterator previous_active_app_it =
       task_id_to_app_window_.find(active_task_id_);
   if (previous_active_app_it != task_id_to_app_window_.end()) {
     owner()->SetItemStatus(previous_active_app_it->second->shelf_id(),
                            ash::STATUS_RUNNING);
     previous_active_app_it->second->SetFullscreenMode(
         previous_active_app_it->second->widget() &&
                 previous_active_app_it->second->widget()->IsFullscreen()
@@ skipping 70 matching lines @@
 
   ArcAppWindowLauncherItemController* controller;
   AppControllerMap::iterator it = app_controller_map_.find(app_id);
   ash::ShelfID shelf_id = 0;
   if (it != app_controller_map_.end()) {
     controller = it->second;
     DCHECK_EQ(controller->app_id(), app_id);
     shelf_id = controller->shelf_id();
   } else {
     controller = new ArcAppWindowLauncherItemController(app_id, owner());
-    shelf_id = owner()->GetShelfIDForAppID(app_id);
+    shelf_id = shelf_delegate_->GetShelfIDForAppID(app_id);
     if (shelf_id == 0) {
       // Map Play Store shelf icon to Arc Support host, to share one entry.
       shelf_id = owner()->CreateAppLauncherItem(controller, app_id,
                                                 ash::STATUS_RUNNING);
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
     app_controller_map_[app_id] = controller;
   }
   controller->AddWindow(app_window);
   owner()->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   app_window->SetController(controller);
   app_window->set_shelf_id(shelf_id);
 }
 
 void ArcAppWindowLauncherController::UnregisterApp(AppWindow* app_window) {
   const std::string app_id = app_window->app_id();
   DCHECK(!app_id.empty());
   AppControllerMap::iterator it = app_controller_map_.find(app_id);
   DCHECK(it != app_controller_map_.end());
 
   ArcAppWindowLauncherItemController* controller = it->second;
   controller->RemoveWindow(app_window);
   if (!controller->window_count()) {
     ash::ShelfID shelf_id = app_window->shelf_id();
     owner()->CloseLauncherItem(shelf_id);
     app_controller_map_.erase(it);
   }
 }