arc: Restore Chrome badging for apps that have peer in Android apps.

extensions/browser/app_window/app_window.cc

 // Copyright 2014 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 "extensions/browser/app_window/app_window.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 543 matching lines @@
       web_contents()->GetController().GetLastCommittedEntry() : nullptr;
   if (!entry || entry->GetTitle().empty()) {
     title = base::UTF8ToUTF16(extension->name());
   } else {
     title = web_contents()->GetTitle();
   }
   base::RemoveChars(title, base::ASCIIToUTF16("\n"), &title);
   return title;
 }
 
+bool AppWindow::HasCustomIcon() const {
+  return window_icon_url_.is_valid() || app_icon_url_.is_valid();
+}
+
 void AppWindow::SetAppIconUrl(const GURL& url) {
   // Avoid using any previous icons that were being downloaded.
   image_loader_ptr_factory_.InvalidateWeakPtrs();
 
   // Reset |app_icon_image_| to abort pending image load (if any).
   if (!show_in_shelf_) {
     app_icon_image_.reset();
     app_icon_url_ = url;
   } else {
     window_icon_url_ = url;
@@ skipping 14 matching lines @@
 
 void AppWindow::UpdateDraggableRegions(
     const std::vector<DraggableRegion>& regions) {
   native_app_window_->UpdateDraggableRegions(regions);
 }
 
 void AppWindow::UpdateAppIcon(const gfx::Image& image) {
   // Set the showInShelf=true window icon and add the app_icon_image_
   // as a badge. If the image is empty, set the default app icon placeholder
   // as the base image.
-  if (window_icon_url_.is_valid() && !app_icon_image_->image().IsEmpty()) {
+  if (window_icon_url_.is_valid() && app_icon_image_ &&
+      !app_icon_image_->image().IsEmpty()) {
     gfx::Image base_image =
         !image.IsEmpty()
             ? image
             : gfx::Image(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                   IDR_APP_DEFAULT_ICON));
     // Scale the icon to EXTENSION_ICON_LARGE.
     const int large_icon_size = extension_misc::EXTENSION_ICON_LARGE;
     if (base_image.Width() != large_icon_size ||
         base_image.Height() != large_icon_size) {
       gfx::ImageSkia resized_image =
@@ skipping 504 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace extensions