Restore ShellWindow app icon in RegisterApp

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

 // Copyright (c) 2012 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/shell_window_launcher_controller.h"
 
 #include "apps/shell_window.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 152 matching lines @@
         ? LauncherItemController::TYPE_APP_PANEL
         : LauncherItemController::TYPE_APP;
     ShellWindowLauncherItemController* controller =
         new ShellWindowLauncherItemController(
             type, app_shelf_id, app_id, owner_);
     controller->AddShellWindow(shell_window, status);
     // 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)
       shelf_id = owner_->GetShelfIDForAppID(app_id);
-    if (shelf_id == 0)
+    if (shelf_id == 0) {
       shelf_id = owner_->CreateAppLauncherItem(controller, app_id, status);
-    else
+      // Restore any existing app icon and flag as set.
+      const gfx::Image& app_icon = shell_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);
+    }
     const std::string app_shelf_id = GetAppShelfId(shell_window);
     app_controller_map_[app_shelf_id] = controller;
   }
   owner_->SetItemStatus(shelf_id, status);
   ash::SetShelfIDForWindow(shelf_id, window);
 }
 
 void ShellWindowLauncherController::UnregisterApp(aura::Window* window) {
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
@@ skipping 28 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return NULL;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }