Refactor GuestView construction

chrome/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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/guest_view/guest_view_base.h"
 
-#include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/guest_view/app_view/app_view_guest.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/event_router.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using content::WebContents;
 
 namespace {
 
+typedef std::map<std::string, GuestViewBase::GuestCreationCallback>
+    GuestViewCreationMap;
+static base::LazyInstance<GuestViewCreationMap> guest_view_registry =
+    LAZY_INSTANCE_INITIALIZER;
+
 typedef std::map<WebContents*, GuestViewBase*> WebContentsGuestViewMap;
 static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 GuestViewBase::Event::Event(const std::string& name,
                             scoped_ptr<base::DictionaryValue> args)
     : name_(name), args_(args.Pass()) {
 }
@@ skipping 95 matching lines @@
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
   GuestViewManager::FromBrowserContext(browser_context_)->
       AddGuest(guest_instance_id_, guest_web_contents);
 
   // Give the derived class an opportunity to perform additional initialization.
   DidInitialize();
 }
 
 // static
+void GuestViewBase::RegisterGuestViewTypes() {
+  GuestView<WebViewGuest>::Register();
+  GuestView<AppViewGuest>::Register();
+}
+
+// static
+void GuestViewBase::RegisterGuestViewType(
+    const std::string& view_type,
+    const GuestCreationCallback& callback) {
+  GuestViewCreationMap::iterator it =
+      guest_view_registry.Get().find(view_type);
+  DCHECK(it == guest_view_registry.Get().end());
+  guest_view_registry.Get()[view_type] = callback;
+}
+
+// static
 GuestViewBase* GuestViewBase::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id,
     const std::string& view_type) {
-  if (view_type == WebViewGuest::Type) {
-    return new WebViewGuest(browser_context, guest_instance_id);
-  } else if (view_type == AppViewGuest::Type) {
-    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableAppView)) {
-      return NULL;
-    }
-    return new AppViewGuest(browser_context, guest_instance_id);
+  GuestViewCreationMap::iterator it =
+      guest_view_registry.Get().find(view_type);
+  if (it == guest_view_registry.Get().end()) {
+    NOTREACHED();
+    return NULL;
   }
-  NOTREACHED();
-  return NULL;
+  return it->second.Run(browser_context, guest_instance_id);
 }
 
 // static
 GuestViewBase* GuestViewBase::FromWebContents(WebContents* web_contents) {
   WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
   WebContentsGuestViewMap::iterator it = guest_map->find(web_contents);
   return it == guest_map->end() ? NULL : it->second;
 }
 
 // static
@@ skipping 196 matching lines @@
     // purpose. Let's self-destruct.
     delete this;
     callback.Run(NULL);
     return;
   }
   InitWithWebContents(embedder_extension_id,
                       embedder_render_process_id,
                       guest_web_contents);
   callback.Run(guest_web_contents);
 }