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

Unified Diff: extensions/browser/guest_view/guest_view_base.h

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed NavigateGuest Created 5 years, 8 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: extensions/browser/guest_view/guest_view_base.h
diff --git a/extensions/browser/guest_view/guest_view_base.h b/extensions/browser/guest_view/guest_view_base.h
index 7969cb9e876424dc5000fae920bfb28c18c0e5e1..6252e6c19fc1a58ef6fd63d90e30a38d4dd11f98 100644
--- a/extensions/browser/guest_view/guest_view_base.h
+++ b/extensions/browser/guest_view/guest_view_base.h
@@ -241,14 +241,6 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
// Returns the instance ID of the GuestViewBase's element.
int element_instance_id() const { return element_instance_id_; }
- // Returns the extension ID of the embedder.
- const std::string& owner_extension_id() const {
- return owner_extension_id_;
- }
-
- // Returns whether this GuestView is embedded in an extension/app.
- bool in_extension() const { return !owner_extension_id_.empty(); }
-
bool can_owner_receive_events() const { return !!view_instance_id_; }
// Returns the user browser context of the embedder.
@@ -261,6 +253,10 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
// Returns the URL of the owner WebContents.
const GURL& GetOwnerSiteURL() const;
+ // Returns the host of the owner WebContents. For extensions, this is the
+ // extension ID.
+ std::string owner_host() const { return owner_host_; }
+
// Whether the guest view is inside a plugin document.
bool is_full_page_plugin() const { return is_full_page_plugin_; }
@@ -381,7 +377,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
// |owner_web_contents_|. If |owner_web_contents_| is destroyed then this
// guest will also self-destruct.
content::WebContents* owner_web_contents_;
- std::string owner_extension_id_;
+ std::string owner_host_;
content::BrowserContext* const browser_context_;
// |guest_instance_id_| is a profile-wide unique identifier for a guest

Powered by Google App Engine
This is Rietveld 408576698