[Merge M58] arc: Restore Chrome badging for apps that have peer in Android apps.

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/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
@@ skipping 74 matching lines @@
   registry->AddObserver(this);
   registry_.insert(registry);
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowIconChanged(
     AppWindow* app_window) {
   const std::string app_shelf_id = GetAppShelfId(app_window);
   AppControllerMap::iterator iter = app_controller_map_.find(app_shelf_id);
   if (iter == app_controller_map_.end())
     return;
+
+  // Check if the window actually overrides its default icon. Otherwise use app
+  // icon loader provided by owner.
+  if (!app_window->HasCustomIcon() || app_window->app_icon().IsEmpty())
+    return;
+
   ExtensionAppWindowLauncherItemController* controller = iter->second;
   controller->set_image_set_by_controller(true);
   owner()->SetLauncherItemImage(controller->shelf_id(),
                                 app_window->app_icon().AsImageSkia());
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowShown(
     AppWindow* app_window,
     bool was_hidden) {
   aura::Window* window = app_window->GetNativeWindow();
@@ skipping 67 matching lines @@
     controller->AddAppWindow(app_window);
     // If there is already a shelf id mapped to this app_shelf_id (e.g. pinned),
     // use that shelf item.
     shelf_id =
         ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
             app_id, launch_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());
+      if (app_window->HasCustomIcon() && !app_window->app_icon().IsEmpty()) {
+        owner()->SetLauncherItemImage(shelf_id,
+                                      app_window->app_icon().AsImageSkia());
         controller->set_image_set_by_controller(true);
       }
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
 
     // We need to change the controller associated with app_shelf_id.
     app_controller_map_[app_shelf_id] = controller;
   }
   owner()->SetItemStatus(shelf_id, status);
@@ skipping 39 matching lines @@
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   if (window_iter == window_to_app_shelf_id_map_.end())
     return nullptr;
   AppControllerMap::iterator app_controller_iter =
       app_controller_map_.find(window_iter->second);
   if (app_controller_iter == app_controller_map_.end())
     return nullptr;
   return app_controller_iter->second;
 }