Fix a couple of crashes related to app-crashed balloon.

chrome/browser/background_contents_service.cc

 // Copyright (c) 2011 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_contents_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 47 matching lines @@
   }
 
   void Display() {}
 
   void Error() {}
 
   void Close(bool by_user) {}
 
   void Click() {
     if (is_hosted_app_) {
-      BackgroundContentsServiceFactory::GetForProfile(profile_)->
-          LoadBackgroundContentsForExtension(profile_, extension_id_);
+      const Extension* extension =
+          profile_->GetExtensionService()->GetInstalledExtension(extension_id_);
+      if (extension && extension->background_url().is_valid()) {
+        // If the app has a background page listed in the manifest, then reload
+        // the background page.
+        BackgroundContentsServiceFactory::GetForProfile(profile_)->
+            LoadBackgroundContentsForExtension(profile_, extension_id_);
+      } else if (extension) {
+        // Try to open the home page for the crashed app. If there is already an
+        // open sad tab for it, try to reload the app in that tab. If a tab
+        // cannot be opened because there is no appropriate window, then open a
+        // new window for the app.
+        if (!Browser::OpenApplicationTab(profile_, extension, SINGLETON_TAB)) {

[Andrew T Wilson (Slow), 2011/05/14 01:01:37]

I'm not positive this is the right behavior:

1) We aren't reloading dynamically created BackgroundContents, and it seems like
we should.
2) Should we really bring up the launch page for the app? I'm thinking of the
case where an app is running in the background (no tabs are open for the app,
just a background contents) - the background contents crashes, the user clicks
the notification, and we launch the app rather than restarting the background
contents.

+          Browser::OpenApplicationWindow(profile_, extension,
+                                         extension_misc::LAUNCH_WINDOW,
+                                         extension->GetFullLaunchURL(),
+                                         NULL);
+        }
+      }
     } else {
       profile_->GetExtensionService()->ReloadExtension(extension_id_);
     }
 
     // Closing the balloon here should be OK, but it causes a crash on Mac
     // http://crbug.com/78167
     ScheduleCloseBalloon(extension_id_);
   }
 
   std::string id() const {
@@ skipping 481 matching lines @@
     TabContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(
       new_contents->profile());
   if (!browser)
     return;
   browser->AddTabContents(new_contents, disposition, initial_pos, user_gesture);
 }