summaryrefslogtreecommitdiffstats
path: root/chrome/browser/guestview/adview
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 16:51:19 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 16:51:19 +0000
commitdbbce92c06dba4516deee8c329ddf2eed9ed7c18 (patch)
treee264e6cf2eaf2be50cb4f8bda51a5cb5698b7454 /chrome/browser/guestview/adview
parent3974f9daabe27ea1b1cec79d2e12e1036474192a (diff)
downloadchromium_src-dbbce92c06dba4516deee8c329ddf2eed9ed7c18.zip
chromium_src-dbbce92c06dba4516deee8c329ddf2eed9ed7c18.tar.gz
chromium_src-dbbce92c06dba4516deee8c329ddf2eed9ed7c18.tar.bz2
Refactor GuestView to take in extension_id on construction
This is a prerequisite to support relative URL resolution to chrome-extension URLs. The guest site instance is constructed in BrowserPluginGuestManager::CreateGuest with the appropriate host corresponding to the extension ID of the app/extension hosting the GuestView. This CL gets rid of some code duplication. BUG=308114 R=creis@chromium.org, jam@chromium.org Review URL: https://codereview.chromium.org/45313014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/guestview/adview')
-rw-r--r--chrome/browser/guestview/adview/adview_guest.cc5
-rw-r--r--chrome/browser/guestview/adview/adview_guest.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/guestview/adview/adview_guest.cc b/chrome/browser/guestview/adview/adview_guest.cc
index 0c887d4..44acbd9 100644
--- a/chrome/browser/guestview/adview/adview_guest.cc
+++ b/chrome/browser/guestview/adview/adview_guest.cc
@@ -12,8 +12,9 @@
using content::WebContents;
-AdViewGuest::AdViewGuest(WebContents* guest_web_contents)
- : GuestView(guest_web_contents),
+AdViewGuest::AdViewGuest(WebContents* guest_web_contents,
+ const std::string& extension_id)
+ : GuestView(guest_web_contents, extension_id),
WebContentsObserver(guest_web_contents) {
}
diff --git a/chrome/browser/guestview/adview/adview_guest.h b/chrome/browser/guestview/adview/adview_guest.h
index 9327363..3d8a9aa 100644
--- a/chrome/browser/guestview/adview/adview_guest.h
+++ b/chrome/browser/guestview/adview/adview_guest.h
@@ -19,7 +19,8 @@
class AdViewGuest : public GuestView,
public content::WebContentsObserver {
public:
- explicit AdViewGuest(content::WebContents* guest_web_contents);
+ AdViewGuest(content::WebContents* guest_web_contents,
+ const std::string& extension_id);
static AdViewGuest* From(int embedder_process_id, int instance_id);