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

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

Issue 258373002: Towards moving guest management to chrome: Introduce GuestViewManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 6 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: content/browser/browser_plugin/browser_plugin_embedder.h
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index e153a4df79af4261254b35a25c6d26489f907092..14039a35f065e58d857f65fc0c3b2165eb147177 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -86,9 +86,9 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
private:
friend class TestBrowserPluginEmbedder;
- BrowserPluginEmbedder(WebContentsImpl* web_contents);
+ explicit BrowserPluginEmbedder(WebContentsImpl* web_contents);
- BrowserPluginGuestManager* GetBrowserPluginGuestManager();
+ void AllocateInstanceIDResponse(int request_id, int instance_id);
bool DidSendScreenRectsCallback(BrowserPluginGuest* guest);
@@ -99,7 +99,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
// Message handlers.
- void OnAllocateInstanceID(int request_id);
+ void OnAllocateInstanceID(int request_id, const std::string& src);
void OnAttach(int instance_id,
const BrowserPluginHostMsg_Attach_Params& params,
const base::DictionaryValue& extra_params);
@@ -121,6 +121,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
// status messages to the correct guest.
base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
+ base::WeakPtrFactory<BrowserPluginEmbedder> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
};

Powered by Google App Engine
This is Rietveld 408576698