Index: content/browser/browser_plugin/browser_plugin_embedder.cc |
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc |
index 3a98f5d9252e1140df068faaa212b8182bb1feca..70383706b8f920e22ad99c3ec60b724108066457 100644 |
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc |
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc |
@@ -14,7 +14,7 @@ |
#include "content/common/drag_messages.h" |
#include "content/common/gpu/gpu_messages.h" |
#include "content/public/browser/browser_context.h" |
-#include "content/public/browser/browser_plugin_guest_manager_delegate.h" |
+#include "content/public/browser/browser_plugin_guest_manager.h" |
#include "content/public/browser/content_browser_client.h" |
#include "content/public/browser/native_web_keyboard_event.h" |
#include "content/public/browser/render_view_host.h" |
@@ -66,9 +66,9 @@ WebContentsImpl* BrowserPluginEmbedder::GetWebContents() const { |
return static_cast<WebContentsImpl*>(web_contents()); |
} |
-BrowserPluginGuestManagerDelegate* |
+BrowserPluginGuestManager* |
BrowserPluginEmbedder::GetBrowserPluginGuestManager() const { |
- return GetWebContents()->GetBrowserContext()->GetGuestManagerDelegate(); |
+ return GetWebContents()->GetBrowserContext()->GetGuestManager(); |
} |
bool BrowserPluginEmbedder::DidSendScreenRectsCallback( |
@@ -176,8 +176,7 @@ void BrowserPluginEmbedder::GuestCallback( |
BrowserPluginGuest* guest = guest_web_contents ? |
static_cast<WebContentsImpl*>(guest_web_contents)-> |
GetBrowserPluginGuest() : NULL; |
- BrowserPluginGuestManagerDelegate* guest_manager = |
- GetBrowserPluginGuestManager(); |
+ BrowserPluginGuestManager* guest_manager = GetBrowserPluginGuestManager(); |
if (guest) { |
// There is an implicit order expectation here: |
// 1. The content embedder is made aware of the attachment. |