Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1242)

Unified Diff: chrome/browser/guestview/guestview.h

Issue 27408004: <webview>: Resolve relative paths as chrome-extension: URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactor + addressed creis' comments Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/guestview/guestview.h
diff --git a/chrome/browser/guestview/guestview.h b/chrome/browser/guestview/guestview.h
index 75db06fed0378b1fc62564a2896fde32b80e32e3..4f3e35c6d3e0699d23e834062be2e82dded5a2b1 100644
--- a/chrome/browser/guestview/guestview.h
+++ b/chrome/browser/guestview/guestview.h
@@ -43,6 +43,7 @@ class GuestView : public content::BrowserPluginGuestDelegate {
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);
@@ -50,7 +51,6 @@ class GuestView : public content::BrowserPluginGuestDelegate {
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 {
@@ -89,7 +89,8 @@ class GuestView : public content::BrowserPluginGuestDelegate {
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.
@@ -100,7 +101,7 @@ class GuestView : public content::BrowserPluginGuestDelegate {
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
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

Powered by Google App Engine
This is Rietveld 408576698