Change default logic for OpenApplicationTab for extensions without launch URLs

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 599 matching lines @@
   DCHECK(extensions_service);
 
   ExtensionPrefs::LaunchType launch_type =
       extensions_service->extension_prefs()->GetLaunchType(
           extension->id(), ExtensionPrefs::LAUNCH_REGULAR);
   UMA_HISTOGRAM_ENUMERATION("Extensions.AppTabLaunchType", launch_type, 100);
   int add_type = TabStripModel::ADD_SELECTED;
   if (launch_type == ExtensionPrefs::LAUNCH_PINNED)
     add_type |= TabStripModel::ADD_PINNED;
 
+  // For extensions lacking launch urls, determine a reasonable fallback.
+  GURL extension_url = extension->GetFullLaunchURL();
+  if (!extension_url.is_valid()) {
+    extension_url = extension->options_url();
+    if (!extension_url.is_valid())
+      extension_url = GURL("chrome://extensions/");

[Andrew T Wilson (Slow), 2011/01/22 01:32:14]

You should use chrome::kChromeUIExtensionsURL here instead.

[The wrong rickcam account, 2011/01/22 01:42:30]

Done.

+  }
+
   // TODO(erikkay): START_PAGE doesn't seem like the right transition in all
   // cases.
-  browser::NavigateParams params(browser, extension->GetFullLaunchURL(),
+  browser::NavigateParams params(browser, extension_url,
                                  PageTransition::START_PAGE);
   params.tabstrip_add_types = add_type;
 
   // Launch the application in the existing TabContents, if it was supplied.
   if (existing_tab) {
     TabStripModel* model = browser->tabstrip_model();
     int tab_index = model->GetWrapperIndex(existing_tab);
 
     existing_tab->OpenURL(extension->GetFullLaunchURL(), existing_tab->GetURL(),
                           CURRENT_TAB, PageTransition::LINK);
@@ skipping 3632 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }