Adding MimeHandlerView.

chrome/browser/guest_view/guest_view_manager.cc

 // Copyright 2014 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/guest_view/guest_view_manager.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager_factory.h"
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_system.h"
 #include "net/base/escape.h"
+#include "net/base/url_util.h"
 #include "url/gurl.h"
 
 using content::BrowserContext;
 using content::SiteInstance;
 using content::WebContents;
 
 // static
 GuestViewManagerFactory* GuestViewManager::factory_ = NULL;
 
 GuestViewManager::GuestViewManager(content::BrowserContext* context)
@@ skipping 81 matching lines @@
     // If we kill the embedder, then don't bother calling back.
     return;
   }
   content::WebContents* guest_web_contents =
       GetGuestByInstanceID(guest_instance_id);
   callback.Run(guest_web_contents);
 }
 
 SiteInstance* GuestViewManager::GetGuestSiteInstance(
     const GURL& guest_site) {
+  std::string mime_type_param;
+  bool has_mime_type_param = net::GetValueForKeyInQuery(guest_site,

[Fady Samuel, 2014/07/22 10:59:49]

I don't understand this change. Why not simply have the MIME type directly in
the guest site?

[lazyboy, 2014/07/22 20:32:56]

I've changed it to have mime type directly in the guest site, prefixed with
"mime-" to avoid collision with regular guest pages.

+                                                        guestview::kMimeTypeParam,
+                                                        &mime_type_param);
   for (GuestInstanceMap::const_iterator it =
        guest_web_contents_by_instance_id_.begin();
        it != guest_web_contents_by_instance_id_.end(); ++it) {
-    if (it->second->GetSiteInstance()->GetSiteURL() == guest_site)
+
+    bool guest_found =
+        it->second->GetSiteInstance()->GetSiteURL() == guest_site;
+
+    if (!guest_found && has_mime_type_param) {
+      std::string iter_mime_type_param;
+      bool iter_has_mime_type_param =
+          net::GetValueForKeyInQuery(it->second->GetSiteInstance()->GetSiteURL(),
+                                     guestview::kMimeTypeParam,
+                                     &iter_mime_type_param);
+      if (iter_has_mime_type_param && iter_mime_type_param == mime_type_param) {
+        // If we have a mimeType param specified in the Site URL, we will re-use
+        // guests that has same mimeType.
+        guest_found = true;
+      }
+    }
+
+    if (guest_found)
       return it->second->GetSiteInstance();
   }
   return NULL;
 }
 
 bool GuestViewManager::ForEachGuest(WebContents* embedder_web_contents,
                                     const GuestCallback& callback) {
   for (GuestInstanceMap::iterator it =
            guest_web_contents_by_instance_id_.begin();
        it != guest_web_contents_by_instance_id_.end(); ++it) {
@@ skipping 98 matching lines @@
       guest_web_contents_by_instance_id_.find(guest_instance_id);
   if (it == guest_web_contents_by_instance_id_.end())
     return true;
 
   GuestViewBase* guest_view = GuestViewBase::FromWebContents(it->second);
   if (!guest_view)
     return false;
 
   return embedder_render_process_id == guest_view->embedder_render_process_id();
 }