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

chrome/browser/guestview/guestview.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_GUESTVIEW_GUESTVIEW_H_
 #define CHROME_BROWSER_GUESTVIEW_GUESTVIEW_H_
 
 #include <queue>
 
 #include "base/values.h"
@@ skipping 25 matching lines @@
     scoped_ptr<DictionaryValue> GetArguments();
 
    private:
     const std::string event_name_;
     scoped_ptr<DictionaryValue> args_;
   };
 
   static Type GetViewTypeFromString(const std::string& api_type);
 
   static GuestView* Create(content::WebContents* guest_web_contents,
+                           const std::string& extension_id,
                            Type view_type);
 
   static GuestView* FromWebContents(content::WebContents* web_contents);
 
   static GuestView* From(int embedder_process_id, int instance_id);
 
   virtual void Attach(content::WebContents* embedder_web_contents,
-                      const std::string& extension_id,
                       const base::DictionaryValue& args);
 
   content::WebContents* embedder_web_contents() const {
     return embedder_web_contents_;
   }
 
   // Returns the guest WebContents.
   content::WebContents* guest_web_contents() const {
     return guest_web_contents_;
   }
@@ skipping 18 matching lines @@
   // Returns the extension ID of the embedder.
   const std::string& extension_id() const { return extension_id_; }
 
   // Returns the user browser context of the embedder.
   content::BrowserContext* browser_context() const { return browser_context_; }
 
   // Returns the embedder's process ID.
   int embedder_render_process_id() const { return embedder_render_process_id_; }
 
  protected:
-  explicit GuestView(content::WebContents* guest_web_contents);
+  GuestView(content::WebContents* guest_web_contents,
+            const std::string& extension_id);
   virtual ~GuestView();
 
   // Dispatches an event |event_name| to the embedder with the |event| fields.
   void DispatchEvent(Event* event);
 
  private:
   void SendQueuedEvents();
 
   content::WebContents* guest_web_contents_;
   content::WebContents* embedder_web_contents_;
-  std::string extension_id_;
+  const std::string extension_id_;

[Charlie Reis, 2013/10/30 20:42:20]

I definitely like that we know the extension ID on creation in this approach.

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

:-)

   int embedder_render_process_id_;
   content::BrowserContext* browser_context_;
   // |guest_instance_id_| is a profile-wide unique identifier for a guest
   // WebContents.
   const int guest_instance_id_;
   // |view_instance_id_| is an identifier that's unique within a particular
   // embedder RenderViewHost for a particular <*view> instance.
   int view_instance_id_;
 
   // This is a queue of Events that are destined to be sent to the embedder once
   // the guest is attached to a particular embedder.
   std::queue<Event*> pending_events_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestView);
 };
 
 #endif  // CHROME_BROWSER_GUESTVIEW_GUESTVIEW_H_