Remove BrowserPluginGuestManager

content/browser/browser_plugin/browser_plugin_embedder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 
 #include "base/values.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
-#include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #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/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ skipping 31 matching lines @@
 }
 
 void BrowserPluginEmbedder::StartDrag(BrowserPluginGuest* guest) {
   guest_started_drag_ = guest->AsWeakPtr();
 }
 
 WebContentsImpl* BrowserPluginEmbedder::GetWebContents() const {
   return static_cast<WebContentsImpl*>(web_contents());
 }
 
-BrowserPluginGuestManager*
+BrowserPluginGuestManagerDelegate*
 BrowserPluginEmbedder::GetBrowserPluginGuestManager() const {
-  return BrowserPluginGuestManager::FromBrowserContext(
-      GetWebContents()->GetBrowserContext());
+  return GetWebContents()->GetBrowserContext()->GetGuestManagerDelegate();
 }
 
 bool BrowserPluginEmbedder::DidSendScreenRectsCallback(
-   BrowserPluginGuest* guest) {
+   WebContents* guest_web_contents) {
   static_cast<RenderViewHostImpl*>(
-      guest->GetWebContents()->GetRenderViewHost())->SendScreenRects();
+      guest_web_contents->GetRenderViewHost())->SendScreenRects();
   // Not handled => Iterate over all guests.
   return false;
 }
 
 void BrowserPluginEmbedder::DidSendScreenRects() {
-  BrowserPluginGuestManager::FromBrowserContext(
-      GetWebContents()->GetBrowserContext())->ForEachGuest(
+  GetBrowserPluginGuestManager()->ForEachGuest(
           GetWebContents(), base::Bind(
               &BrowserPluginEmbedder::DidSendScreenRectsCallback,
               base::Unretained(this)));
 }
 
 bool BrowserPluginEmbedder::UnlockMouseIfNecessaryCallback(
     const NativeWebKeyboardEvent& event,
-    BrowserPluginGuest* guest) {
-  return guest->UnlockMouseIfNecessary(event);
+    WebContents* guest_web_contents) {
+  return static_cast<WebContentsImpl*>(guest_web_contents)->
+      GetBrowserPluginGuest()->UnlockMouseIfNecessary(event);
 }
 
 bool BrowserPluginEmbedder::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if ((event.type != blink::WebInputEvent::RawKeyDown) ||
       (event.windowsKeyCode != ui::VKEY_ESCAPE) ||
       (event.modifiers & blink::WebInputEvent::InputModifiers)) {
     return false;
   }
 
   return GetBrowserPluginGuestManager()->ForEachGuest(
       GetWebContents(),
       base::Bind(&BrowserPluginEmbedder::UnlockMouseIfNecessaryCallback,
                  base::Unretained(this),
                  event));
 }
 
 bool BrowserPluginEmbedder::SetZoomLevelCallback(
-    double level, BrowserPluginGuest* guest) {
+    double level, WebContents* guest_web_contents) {
   double zoom_factor = content::ZoomLevelToZoomFactor(level);
-  guest->SetZoom(zoom_factor);
+  static_cast<WebContentsImpl*>(guest_web_contents)->GetBrowserPluginGuest()->
+      SetZoom(zoom_factor);
   // Not handled => Iterate over all guests.
   return false;
 }
 
 void BrowserPluginEmbedder::SetZoomLevel(double level) {
   GetBrowserPluginGuestManager()->ForEachGuest(
       GetWebContents(), base::Bind(
           &BrowserPluginEmbedder::SetZoomLevelCallback,
           base::Unretained(this),
           level));
@@ skipping 39 matching lines @@
 void BrowserPluginEmbedder::OnAllocateInstanceID(int request_id) {
   int instance_id = GetBrowserPluginGuestManager()->GetNextInstanceID();
   Send(new BrowserPluginMsg_AllocateInstanceID_ACK(
       routing_id(), request_id, instance_id));
 }
 
 void BrowserPluginEmbedder::GuestCallback(
     int instance_id,
     const BrowserPluginHostMsg_Attach_Params& params,
     const base::DictionaryValue* extra_params,
-    BrowserPluginGuest* guest) {
-  BrowserPluginGuestManager* guest_manager = GetBrowserPluginGuestManager();
+    WebContents* guest_web_contents) {
+  BrowserPluginGuest* guest = guest_web_contents ?
+      static_cast<WebContentsImpl*>(guest_web_contents)->
+          GetBrowserPluginGuest() : NULL;
+  BrowserPluginGuestManagerDelegate* guest_manager =

[lazyboy, 2014/05/05 21:40:54]

Declare this close to where you use it.

[Fady Samuel, 2014/05/07 17:32:59]

Removed entirely.

+      GetBrowserPluginGuestManager();
   if (guest) {
     // There is an implicit order expectation here:
     // 1. The content embedder is made aware of the attachment.
     // 2. BrowserPluginGuest::Attach is called.
     // 3. The content embedder issues queued events if any that happened
     //    prior to attachment.
     GetContentClient()->browser()->GuestWebContentsAttached(
         guest->GetWebContents(),
         GetWebContents(),
         *extra_params);
     guest->Attach(GetWebContents(), params, *extra_params);
     return;
   }
 
   scoped_ptr<base::DictionaryValue> copy_extra_params(extra_params->DeepCopy());
   StorageInfo storage_info;
   storage_info.partition_id = params.storage_partition_id;
   storage_info.persist = params.persist_storage;
-  guest = guest_manager->CreateGuest(
+  guest_web_contents = guest_manager->CreateGuest(
       GetWebContents()->GetSiteInstance(),
       instance_id, storage_info,
       copy_extra_params.Pass());
+  guest = guest_web_contents ?
+      static_cast<WebContentsImpl*>(guest_web_contents)->
+          GetBrowserPluginGuest() : NULL;
   if (guest) {
     GetContentClient()->browser()->GuestWebContentsAttached(
         guest->GetWebContents(),
         GetWebContents(),
         *extra_params);
     guest->Initialize(params, GetWebContents());
   }
 }
 
 void BrowserPluginEmbedder::OnAttach(
     int instance_id,
     const BrowserPluginHostMsg_Attach_Params& params,
     const base::DictionaryValue& extra_params) {
   GetBrowserPluginGuestManager()->MaybeGetGuestByInstanceIDOrKill(
       instance_id, GetWebContents()->GetRenderProcessHost()->GetID(),
       base::Bind(&BrowserPluginEmbedder::GuestCallback,
                  base::Unretained(this),
                  instance_id,
                  params,
                  &extra_params));
 }
 
 }  // namespace content