Part 1 of merging Extensions and DOMUI

chrome/browser/renderer_host/render_view_host_manager.cc

Index: chrome/browser/renderer_host/render_view_host_manager.cc
diff --git a/chrome/browser/renderer_host/render_view_host_manager.cc b/chrome/browser/renderer_host/render_view_host_manager.cc
index c0be053bf1f7055f0f57587104fdc85f8907a680..7c4d21928db4af6cbf456b1c8cae377d05d41a60 100644
--- a/chrome/browser/renderer_host/render_view_host_manager.cc
+++ b/chrome/browser/renderer_host/render_view_host_manager.cc
@@ -19,6 +19,7 @@
 #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;
@@ -294,6 +295,14 @@ bool RenderViewHostManager::ShouldSwapProcessesForNavigation(
       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;
 }