Towards moving guest management to chrome: Introduce GuestViewManager

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 26 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/guestview/adview/adview_guest.h"
 #include "chrome/browser/guestview/guestview.h"
 #include "chrome/browser/guestview/guestview_constants.h"
+#include "chrome/browser/guestview/guestview_manager.h"
 #include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/media/cast_transport_host_filter.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugins/plugin_info_message_filter.h"
@@ skipping 751 matching lines @@
   // safe to continue.
   CHECK(can_be_default || !partition_domain->empty());
 }
 
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
   return chrome::CreateWebContentsViewDelegate(web_contents);
 }
 
+content::BrowserPluginGuestManagerDelegate*
+    ChromeContentBrowserClient::GetGuestManagerDelegate(

[lazyboy, 2014/04/30 08:40:15]

nit: think you don't need spaces here.

+        content::BrowserContext* context) {
+  return new GuestViewManager(context);
+}
+
 void ChromeContentBrowserClient::GuestWebContentsCreated(
     SiteInstance* guest_site_instance,
     WebContents* guest_web_contents,
     WebContents* opener_web_contents,
     content::BrowserPluginGuestDelegate** guest_delegate,
     scoped_ptr<base::DictionaryValue> extra_params) {
   if (!guest_site_instance) {
     NOTREACHED();
     return;
   }
@@ skipping 21 matching lines @@
     GuestView* guest = GuestView::FromWebContents(opener_web_contents);
     if (!guest) {
       NOTREACHED();
       return;
     }
 
     // Create a new GuestView of the same type as the opener.
     *guest_delegate =
         GuestView::Create(guest_web_contents,
                           extension_id,
-                          guest->GetViewType());
+                          guest->GetViewType(),
+                          guest->AsWeakPtr());
     return;
   }
 
   if (!extra_params) {
     NOTREACHED();
     return;
   }
   std::string api_type;
   extra_params->GetString(guestview::kParameterApi, &api_type);
 
   if (api_type.empty())
     return;
 
   *guest_delegate =
       GuestView::Create(guest_web_contents,
                         extension_id,
-                        GuestView::GetViewTypeFromString(api_type));
+                        GuestView::GetViewTypeFromString(api_type),
+                        base::WeakPtr<GuestView>());
 }
 
 void ChromeContentBrowserClient::GuestWebContentsAttached(
     WebContents* guest_web_contents,
     WebContents* embedder_web_contents,
     const base::DictionaryValue& extra_params) {
 
   GuestView* guest = GuestView::FromWebContents(guest_web_contents);
   if (!guest) {
     // It's ok to return here, since we could be running a browser plugin
@@ skipping 1790 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome