Part 1 of merging Extensions and DOMUI

chrome/browser/renderer_host/render_view_host_manager.cc

 // Copyright (c) 2009 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/renderer_host/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"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 
 namespace base {
 class WaitableEvent;
 }
 
 RenderViewHostManager::RenderViewHostManager(
     RenderViewHostDelegate* render_view_delegate,
     Delegate* delegate)
     : delegate_(delegate),
       cross_navigation_pending_(false),
@@ skipping 255 matching lines @@
   // 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::HasDOMUIScheme(cur_entry->url()) !=
       DOMUIFactory::HasDOMUIScheme(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;
+      
+
   return false;
 }
 
 SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
     const NavigationEntry& entry,
     SiteInstance* curr_instance) {
   // NOTE: This is only called when ShouldTransitionCrossSite is true.
 
   // If the entry has an instance already, we should use it.
   if (entry.site_instance())
@@ skipping 276 matching lines @@
 
   pending_dom_ui_.reset();
 }
 
 void RenderViewHostManager::CrossSiteNavigationCanceled() {
   DCHECK(cross_navigation_pending_);
   cross_navigation_pending_ = false;
   if (pending_render_view_host_)
     CancelPending();
 }