Adding ChromeLauncherController interface.

chrome/browser/ui/ash/launcher/extension_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/extension_app_window_launcher_controller.h"
 
+#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 
 namespace {
 
 std::string GetAppShelfId(AppWindow* app_window) {
   if (app_window->window_type_is_panel())
     return base::StringPrintf("panel:%d", app_window->session_id().id());
   return app_window->extension_id();
 }
 
 }  // namespace
 
 ExtensionAppWindowLauncherController::ExtensionAppWindowLauncherController(
     ChromeLauncherController* owner)
     : AppWindowLauncherController(owner) {
-  AppWindowRegistry* registry = AppWindowRegistry::Get(owner->profile());
+  AppWindowRegistry* registry = AppWindowRegistry::Get(owner->GetProfile());
   registry_.insert(registry);
   registry->AddObserver(this);
 }
 
 ExtensionAppWindowLauncherController::~ExtensionAppWindowLauncherController() {
   for (std::set<AppWindowRegistry*>::iterator it = registry_.begin();
        it != registry_.end(); ++it)
     (*it)->RemoveObserver(this);
 
   for (WindowToAppShelfIdMap::iterator iter =
@@ skipping 84 matching lines @@
     LauncherItemController::Type type =
         app_window->window_type_is_panel()
             ? LauncherItemController::TYPE_APP_PANEL
             : LauncherItemController::TYPE_APP;
     ExtensionAppWindowLauncherItemController* controller =
         new ExtensionAppWindowLauncherItemController(type, app_shelf_id, app_id,
                                                      owner());
     controller->AddAppWindow(app_window);
     // If the app shelf id is not unique, and there is already a shelf
     // item for this app id (e.g. pinned), use that shelf item.
     if (app_shelf_id == app_id)

[msw, 2016/06/10 22:44:39]

nit: curly braces

[mfomitchev, 2016/06/13 17:29:18]

Done.

-      shelf_id = owner()->GetShelfIDForAppID(app_id);
+      shelf_id =
+          ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(
+              app_id);
     if (shelf_id == 0) {
       shelf_id = owner()->CreateAppLauncherItem(controller, app_id, status);
       // Restore any existing app icon and flag as set.
       const gfx::Image& app_icon = app_window->app_icon();
       if (!app_icon.IsEmpty()) {
         owner()->SetLauncherItemImage(shelf_id, app_icon.AsImageSkia());
         controller->set_image_set_by_controller(true);
       }
     } else {
       owner()->SetItemController(shelf_id, controller);
@@ skipping 40 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return nullptr;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return nullptr;
   return iter2->second;
 }