Reland r57788 - Expose Extension Bindings to Component Applications

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 840 matching lines @@
 
   if (delegate_ && delegate_->ShouldEnablePreferredSizeNotifications()) {
     dest_render_view_host->EnablePreferredSizeChangedMode(
         kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
   }
 
   // For security, we should never send non-DOM-UI URLs (other than about:blank)
   // to a DOM UI renderer.  Double check that here.
   int enabled_bindings = dest_render_view_host->enabled_bindings();
   bool is_allowed_in_dom_ui_renderer =
-      DOMUIFactory::UseDOMUIForURL(entry.url()) ||
+      DOMUIFactory::UseDOMUIForURL(profile(), entry.url()) ||
       entry.url() == GURL(chrome::kAboutBlankURL);
   CHECK(!BindingsPolicy::is_dom_ui_enabled(enabled_bindings) ||
         is_allowed_in_dom_ui_renderer);
 
   // Tell DevTools agent that it is attached prior to the navigation.
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   if (devtools_manager) {  // NULL in unit tests.
     devtools_manager->OnNavigatingToPendingEntry(render_view_host(),
                                                  dest_render_view_host,
                                                  entry.url());
@@ skipping 725 matching lines @@
   return render_manager_.dom_ui();
 }
 
 void TabContents::DidNavigateMainFramePostCommit(
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (opener_dom_ui_type_ != DOMUIFactory::kNoDOMUI) {
     // If this is a window.open navigation, use the same DOMUI as the renderer
     // that opened the window, as long as both renderers have the same
     // privileges.
-    if (opener_dom_ui_type_ == DOMUIFactory::GetDOMUIType(GetURL())) {
+    if (opener_dom_ui_type_ ==
+        DOMUIFactory::GetDOMUIType(profile(), GetURL())) {
       DOMUI* dom_ui = DOMUIFactory::CreateDOMUIForURL(this, GetURL());
       // dom_ui might be NULL if the URL refers to a non-existent extension.
       if (dom_ui) {
         render_manager_.SetDOMUIPostCommit(dom_ui);
         dom_ui->RenderViewCreated(render_view_host());
       }
     }
     opener_dom_ui_type_ = DOMUIFactory::kNoDOMUI;
   }
 
@@ skipping 1623 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }