Fix a crash regression in Chrome OS when using Bookmark All Tabs.

chrome/browser/ui/webui/chrome_web_ui_factory.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/webui/chrome_web_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/about_ui.h"
 #include "chrome/browser/ui/webui/bookmarks_ui.h"
 #include "chrome/browser/ui/webui/bug_report_ui.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/crashes_ui.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "chrome/browser/ui/webui/downloads_ui.h"
 #include "chrome/browser/ui/webui/edit_search_engine_dialog_ui_webui.h"
 #include "chrome/browser/ui/webui/task_manager_ui.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
@@ skipping 64 matching lines @@
 
 // Template for defining WebUIFactoryFunction.
 template<class T>
 ChromeWebUI* NewWebUI(TabContents* contents, const GURL& url) {
   return new T(contents);
 }
 
 // Special case for extensions.
 template<>
 ChromeWebUI* NewWebUI<ExtensionWebUI>(TabContents* contents, const GURL& url) {
-  // Don't use a WebUI for incognito tabs because we require extensions to run
-  // within a single process.
-  Profile* profile = Profile::FromBrowserContext(contents->browser_context());
-  ExtensionService* service = profile->GetExtensionService();
-  if (service && service->ExtensionBindingsAllowed(url))
-    return new ExtensionWebUI(contents, url);
-  return NULL;
+  return new ExtensionWebUI(contents, url);
 }
 
 // Special case for older about: handlers.
 template<>
 ChromeWebUI* NewWebUI<AboutUI>(TabContents* contents, const GURL& url) {
   return new AboutUI(contents, url.host());
 }
 
 // Returns a function that can be used to create the right type of WebUI for a
 // tab, based on its URL. Returns NULL if the URL doesn't have WebUI associated
-// with it. Even if the factory function is valid, it may yield a NULL WebUI
-// when invoked for a particular tab - see NewWebUI<ExtensionWebUI>.
-WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
+// with it.
+WebUIFactoryFunction GetWebUIFactoryFunction(TabContents* tab_contents,
+                                             Profile* profile,
                                              const GURL& url) {
   if (url.host() == chrome::kChromeUIDialogHost)
     return &NewWebUI<ConstrainedHtmlUI>;
 
+  // Only create ExtensionWebUI for URLs that are allowed extension bindings,
+  // hosted by actual tabs. If tab_contents has no wrapper, it likely refers
+  // to another container type, like an extension background page.
   ExtensionService* service = profile ? profile->GetExtensionService() : NULL;
-  if (service && service->ExtensionBindingsAllowed(url))
-    return &NewWebUI<ExtensionWebUI>;
+  if (service && service->ExtensionBindingsAllowed(url) &&
+      (!tab_contents ||
+        TabContentsWrapper::GetCurrentWrapperForContents(tab_contents)))
+  return &NewWebUI<ExtensionWebUI>;
 
   // All platform builds of Chrome will need to have a cloud printing
   // dialog as backup.  It's just that on Chrome OS, it's the only
   // print dialog.
   if (url.host() == chrome::kChromeUICloudPrintResourcesHost)
     return &NewWebUI<ExternalHtmlDialogUI>;
 
   // This will get called a lot to check all URLs, so do a quick check of other
   // schemes to filter out most URLs.
   if (!url.SchemeIs(chrome::kChromeDevToolsScheme) &&
@@ skipping 180 matching lines @@
     else
       return DefaultSingletonTraits<Type>::New();
   }
 };
 
 }  // namespace
 
 WebUI::TypeID ChromeWebUIFactory::GetWebUIType(
       content::BrowserContext* browser_context, const GURL& url) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
-  WebUIFactoryFunction function = GetWebUIFactoryFunction(profile, url);
+  WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, profile, url);
   return function ? reinterpret_cast<WebUI::TypeID>(function) : WebUI::kNoWebUI;
 }
 
 bool ChromeWebUIFactory::UseWebUIForURL(
     content::BrowserContext* browser_context, const GURL& url) const {
   return GetWebUIType(browser_context, url) != WebUI::kNoWebUI;
 }
 
 bool ChromeWebUIFactory::HasWebUIScheme(const GURL& url) const {
   return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
@@ skipping 15 matching lines @@
       url == GURL(chrome::kChromeUIKillURL) ||
       url == GURL(chrome::kChromeUIHangURL) ||
       url == GURL(chrome::kChromeUIShorthangURL);
 }
 
 WebUI* ChromeWebUIFactory::CreateWebUIForURL(
     TabContents* tab_contents,
     const GURL& url) const {
   Profile* profile =
       Profile::FromBrowserContext(tab_contents->browser_context());
-  WebUIFactoryFunction function = GetWebUIFactoryFunction(profile, url);
+  WebUIFactoryFunction function = GetWebUIFactoryFunction(tab_contents,
+                                                          profile, url);
   if (!function)
     return NULL;
   return (*function)(tab_contents, url);
 }
 
 void ChromeWebUIFactory::GetFaviconForURL(
     Profile* profile,
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url) const {
   // All extensions but the bookmark manager get their favicon from the icons
@@ skipping 64 matching lines @@
     return FlashUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
   return NULL;
 }