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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 618823002: GuestView: Move lifetime management out of content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix extensionoptions cleanup Created 6 years, 3 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: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index cecca6de166bdef20bd3fb02d0282830af6e9146..66234b1f72b9b91a78e47c71aab9b9081c2cc3a3 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -114,10 +114,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
// Called when the embedder WebContents changes visibility.
void EmbedderVisibilityChanged(bool visible);
- // Destroys the guest WebContents and all its associated state, including
- // this BrowserPluginGuest, and its new unattached windows.
- void Destroy();
-
// Creates a new guest WebContentsImpl with the provided |params| with |this|
// as the |opener|.
WebContentsImpl* CreateNewGuestWindow(
@@ -253,7 +249,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
bool last_unlocked_by_target,
bool privileged);
void OnLockMouseAck(int instance_id, bool succeeded);
- void OnPluginDestroyed(int instance_id);
// Resizes the guest's web contents.
void OnResizeGuest(
int instance_id, const BrowserPluginHostMsg_ResizeGuest_Params& params);
@@ -365,6 +360,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
ui::TextInputMode last_input_mode_;
bool last_can_compose_inline_;
+ int guest_proxy_routing_id_;
+
// This is a queue of messages that are destined to be sent to the embedder
// once the guest is attached to a particular embedder.
std::deque<linked_ptr<IPC::Message> > pending_messages_;

Powered by Google App Engine
This is Rietveld 408576698