Fixes a typo: use the default image if the extension doesn't have icon.

chrome/browser/background/background_contents_service.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/background/background_contents_service.h"
 
 #include "apps/app_load_service.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 122 matching lines @@
     }
 
     // Closing the crash notification balloon for the app/extension here should
     // be OK, but it causes a crash on Mac, see: http://crbug.com/78167
     ScheduleCloseBalloon(copied_extension_id);
   }
 
   virtual bool HasClickedListener() OVERRIDE { return true; }
 
   virtual std::string id() const OVERRIDE {
-    return kNotificationPrefix + extension_id_;
+    return BackgroundContentsService::GetNotificationIdForExtension(
+        extension_id_);
   }
 
   virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
     return NULL;
   }
 
  private:
   virtual ~CrashNotificationDelegate() {}
 
   Profile* profile_;
   bool is_hosted_app_;
   bool is_platform_app_;
   std::string extension_id_;
 
   DISALLOW_COPY_AND_ASSIGN(CrashNotificationDelegate);
 };
 
 #if defined(ENABLE_NOTIFICATIONS)
 void NotificationImageReady(
     const std::string extension_name,
     const base::string16 message,
     scoped_refptr<CrashNotificationDelegate> delegate,
     Profile* profile,
     const gfx::Image& icon) {
   gfx::Image notification_icon(icon);
-  if (icon.IsEmpty()) {
+  if (notification_icon.IsEmpty()) {

[Andrew T Wilson (Slow), 2014/02/17 17:12:32]

Why is this changing to use notification_icon instead of icon?

[Jun Mukai, 2014/02/17 19:48:43]

suggestion from the other reviewer.
We created 'notification_icon' from input, and just seeing the created one
instead of the input makes sense to me too.

     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     notification_icon = rb.GetImageNamed(IDR_EXTENSION_DEFAULT_ICON);
   }
 
   // Origin URL must be different from the crashed extension to avoid the
   // conflict. NotificationSystemObserver will cancel all notifications from
   // the same origin when NOTIFICATION_EXTENSION_UNLOADED.
   // TODO(mukai, dewittj): remove this and switch to message center
   // notifications.
   DesktopNotificationService::AddIconNotification(
       GURL() /* empty origin */,
       base::string16(),
       message,
-      icon,
+      notification_icon,
       base::string16(),
       delegate.get(),
       profile);
 }
 #endif
 
-// Show a popup notification balloon with a crash message for a given app/
-// extension.
-void ShowBalloon(const Extension* extension, Profile* profile) {
-#if defined(ENABLE_NOTIFICATIONS)
-  const base::string16 message = l10n_util::GetStringFUTF16(
-      extension->is_app() ? IDS_BACKGROUND_CRASHED_APP_BALLOON_MESSAGE :
-                            IDS_BACKGROUND_CRASHED_EXTENSION_BALLOON_MESSAGE,
-      base::UTF8ToUTF16(extension->name()));
-  extension_misc::ExtensionIcons size(extension_misc::EXTENSION_ICON_MEDIUM);
-  extensions::ExtensionResource resource =
-      extensions::IconsInfo::GetIconResource(
-          extension, size, ExtensionIconSet::MATCH_SMALLER);
-  // We can't just load the image in the Observe method below because, despite
-  // what this method is called, it may call the callback synchronously.
-  // However, it's possible that the extension went away during the interim,
-  // so we'll bind all the pertinent data here.
-  extensions::ImageLoader::Get(profile)->LoadImageAsync(
-      extension,
-      resource,
-      gfx::Size(size, size),
-      base::Bind(
-          &NotificationImageReady,
-          extension->name(),
-          message,
-          make_scoped_refptr(new CrashNotificationDelegate(profile, extension)),
-          profile));
-#endif
-}
-
 void ReloadExtension(const std::string& extension_id, Profile* profile) {
   if (g_browser_process->IsShuttingDown() ||
       !g_browser_process->profile_manager()->IsValidProfile(profile)) {
       return;
   }
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile);
   if (!extension_system || !extension_system->extension_service())
     return;
   if (!extension_system->extension_service()->
@@ skipping 44 matching lines @@
   DCHECK(contents_map_.empty());
 }
 
 // static
 void BackgroundContentsService::
     SetRestartDelayForForceInstalledAppsAndExtensionsForTesting(
         int restart_delay_in_ms) {
   restart_delay_in_ms_ = restart_delay_in_ms;
 }
 
+// static
+std::string BackgroundContentsService::GetNotificationIdForExtension(
+    const std::string& extension_id) {
+  return kNotificationPrefix + extension_id;
+}
+
+// static
+void BackgroundContentsService::ShowBalloon(const Extension* extension,
+                                            Profile* profile) {
+#if defined(ENABLE_NOTIFICATIONS)
+  const base::string16 message = l10n_util::GetStringFUTF16(
+      extension->is_app() ? IDS_BACKGROUND_CRASHED_APP_BALLOON_MESSAGE :
+                            IDS_BACKGROUND_CRASHED_EXTENSION_BALLOON_MESSAGE,
+      base::UTF8ToUTF16(extension->name()));
+  extension_misc::ExtensionIcons size(extension_misc::EXTENSION_ICON_MEDIUM);
+  extensions::ExtensionResource resource =
+      extensions::IconsInfo::GetIconResource(
+          extension, size, ExtensionIconSet::MATCH_SMALLER);
+  // We can't just load the image in the Observe method below because, despite
+  // what this method is called, it may call the callback synchronously.
+  // However, it's possible that the extension went away during the interim,
+  // so we'll bind all the pertinent data here.
+  extensions::ImageLoader::Get(profile)->LoadImageAsync(
+      extension,
+      resource,
+      gfx::Size(size, size),
+      base::Bind(
+          &NotificationImageReady,
+          extension->name(),
+          message,
+          make_scoped_refptr(new CrashNotificationDelegate(profile, extension)),
+          profile));
+#endif
+}
+
 std::vector<BackgroundContents*>
 BackgroundContentsService::GetBackgroundContents() const
 {
   std::vector<BackgroundContents*> contents;
   for (BackgroundContentsMap::const_iterator it = contents_map_.begin();
        it != contents_map_.end(); ++it)
     contents.push_back(it->second.contents);
   return contents;
 }
 
@@ skipping 473 matching lines @@
     bool user_gesture,
     bool* was_blocked) {
   Browser* browser = chrome::FindLastActiveWithProfile(
       Profile::FromBrowserContext(new_contents->GetBrowserContext()),
       chrome::GetActiveDesktop());
   if (browser) {
     chrome::AddWebContents(browser, NULL, new_contents, disposition,
                            initial_pos, user_gesture, was_blocked);
   }
 }