Reland r57788 - Expose Extension Bindings to Component Applications

chrome/browser/tab_contents/render_view_host_manager.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/render_view_host_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
@@ skipping 291 matching lines @@
 
   // We can't switch a RenderView between view source and non-view source mode
   // without screwing up the session history sometimes (when navigating between
   // "view-source:http://foo.com/" and "http://foo.com/", WebKit doesn't treat
   // it as a new navigation). So require a view switch.
   if (cur_entry->IsViewSourceMode() != new_entry->IsViewSourceMode())
     return true;
 
   // For security, we should transition between processes when one is a DOM UI
   // page and one isn't.
-  if (DOMUIFactory::UseDOMUIForURL(cur_entry->url()) !=
-      DOMUIFactory::UseDOMUIForURL(new_entry->url()))
+  Profile* profile = delegate_->GetControllerForRenderManager().profile();
+  if (DOMUIFactory::UseDOMUIForURL(profile, cur_entry->url()) !=
+      DOMUIFactory::UseDOMUIForURL(profile, new_entry->url()))
     return true;
 
   // Also, we must switch if one is an extension and the other is not the exact
   // same extension.
   if (cur_entry->url().SchemeIs(chrome::kExtensionScheme) ||
       new_entry->url().SchemeIs(chrome::kExtensionScheme)) {
     if (cur_entry->url().GetOrigin() != new_entry->url().GetOrigin())
       return true;
   }
 
@@ skipping 141 matching lines @@
 
 bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
                                            const NavigationEntry& entry) {
   // If the pending navigation is to a DOMUI, tell the RenderView about any
   // bindings it will need enabled.
   if (pending_dom_ui_.get())
     render_view_host->AllowBindings(pending_dom_ui_->bindings());
 
   // Tell the RenderView whether it will be used for an extension process.
   Profile* profile = delegate_->GetControllerForRenderManager().profile();
-  bool is_extension_process = false;
-  if (entry.url().SchemeIs(chrome::kExtensionScheme)) {
-    is_extension_process = true;
-  } else if (profile->GetExtensionsService() &&
-             profile->GetExtensionsService()->
-                 GetExtensionByWebExtent(entry.url())) {
-    is_extension_process = true;
-  }
+  bool is_extension_process = profile->GetExtensionsService() &&
+      profile->GetExtensionsService()->ExtensionBindingsAllowed(entry.url());
   render_view_host->set_is_extension_process(is_extension_process);
 
   return delegate_->CreateRenderViewForRenderManager(render_view_host);
 }
 
 void RenderViewHostManager::CommitPending() {
   // First check whether we're going to want to focus the location bar after
   // this commit.  We do this now because the navigation hasn't formally
   // committed yet, so if we've already cleared |pending_dom_ui_| the call chain
   // this triggers won't be able to figure out what's going on.
@@ skipping 174 matching lines @@
   // deleted (not sure from where) but not NULLed.
   if (rvh == pending_render_view_host_) {
     // If you hit this NOTREACHED, please report it in the following bug
     // http://crbug.com/23411 Make sure to include what you were doing when it
     // happened  (navigating to a new page, closing a tab...) and if you can
     // reproduce.
     NOTREACHED();
     pending_render_view_host_ = NULL;
   }
 }