<webview>: Resolve relative paths as chrome-extension: URLs

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 347 matching lines @@
       last_seen_auto_size_enabled_(false),
       is_in_destruction_(false) {
   DCHECK(web_contents);
   web_contents->SetDelegate(this);
   if (opener)
     opener_ = opener->AsWeakPtr();
   GetWebContents()->GetBrowserPluginGuestManager()->AddGuest(instance_id_,
                                                              GetWebContents());
 }
 
+SiteInstance* BrowserPluginGuest::GetEmbedderSiteInstance() const {
+  if (attached())
+    return embedder_web_contents()->GetSiteInstance();
+
+  if (!opener()) {

[Charlie Reis, 2013/10/18 17:37:55]

How do we know this is true?  Couldn't we have an embedder with no opener that
hasn't attached yet?

[Fady Samuel, 2013/10/25 21:10:31]

I've removed this method. It's no longer necessary.

+    NOTREACHED();
+    return NULL;
+  }
+
+  return opener()->embedder_web_contents()->GetSiteInstance();

[Charlie Reis, 2013/10/18 17:37:55]

This seems confusing to me.  There's no guarantee the opener is in the same
SiteInstance in general.  It may be true for V2 apps, but it seems like we're
starting to support other use cases.

[Fady Samuel, 2013/10/25 21:10:31]

Removed.

+}
+
 bool BrowserPluginGuest::AddMessageToConsole(WebContents* source,
                                              int32 level,
                                              const string16& message,
                                              int32 line_no,
                                              const string16& source_id) {
   if (!delegate_)
     return false;
 
   delegate_->AddMessageToConsole(level, message, line_no, source_id);
   return true;
@@ skipping 957 matching lines @@
 void BrowserPluginGuest::OnLockMouseAck(int instance_id, bool succeeded) {
   Send(new ViewMsg_LockMouse_ACK(routing_id(), succeeded));
   pending_lock_request_ = false;
   if (succeeded)
     mouse_locked_ = true;
 }
 
 void BrowserPluginGuest::OnNavigateGuest(
     int instance_id,
     const std::string& src) {
-  GURL url(src);
+  GURL url = delegate_ ? delegate_->ResolveURL(src) : GURL(src);
   // We do not load empty urls in web_contents.
   // If a guest sets empty src attribute after it has navigated to some
   // non-empty page, the action is considered no-op. This empty src navigation
   // should never be sent to BrowserPluginGuest (browser process).
   DCHECK(!src.empty());
   if (src.empty())
     return;
 
   // Do not allow navigating a guest to schemes other than known safe schemes.
   // This will block the embedder trying to load unwanted schemes, e.g.
@@ skipping 376 matching lines @@
   request_info.Set(browser_plugin::kRequestMethod,
                    base::Value::CreateStringValue(request_method));
   request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
 
   RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_DOWNLOAD,
                     new DownloadRequest(callback),
                     request_info);
 }
 
 }  // namespace content