Moving app_view to extensions.

extensions/browser/guest_view/app_view/app_view_guest.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/app_view/app_view_guest.h"
+#include "extensions/browser/guest_view/app_view/app_view_guest.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/guest_view/app_view/app_view_constants.h"
-#include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
-#include "chrome/common/chrome_switches.h"
-#include "components/renderer_context_menu/context_menu_delegate.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/renderer_preferences.h"
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
+#include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/guest_view/app_view/app_view_constants.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/lazy_background_task_queue.h"
+#include "extensions/browser/process_manager.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension_messages.h"
+#include "extensions/common/switches.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace app_runtime = extensions::core_api::app_runtime;
 
 using content::RenderFrameHost;
 using content::WebContents;
 using extensions::ExtensionHost;
 
 namespace extensions {
 
@@ skipping 51 matching lines @@
                                 response_info->callback);
 
   response_map->erase(guest_instance_id);
   return true;
 }
 
 // static
 GuestViewBase* AppViewGuest::Create(content::BrowserContext* browser_context,
                                     int guest_instance_id) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableAppView)) {
+      extensions::switches::kEnableAppView)) {
     return NULL;
   }
-  return new AppViewGuest(browser_context, guest_instance_id);
+  return new AppViewGuest(
+      ExtensionsAPIClient::Get()->CreateAppViewGuestDelegate(),
+      browser_context,
+      guest_instance_id);
 }
 
-AppViewGuest::AppViewGuest(content::BrowserContext* browser_context,
+AppViewGuest::AppViewGuest(AppViewGuestDelegate* app_view_guest_delegate,

[Xi Han, 2014/08/18 21:29:11]

The AppViewGuestDelegate doesn't need to be exposed as a parameter of the
constructor of AppViewGuest, you can initialize it within the constructor, like:

app_view_guest_delegate_.reset(ExtensionsAPIClient::Get()->CreateAppViewGuestDelegate());

+                           content::BrowserContext* browser_context,
                            int guest_instance_id)
     : GuestView<AppViewGuest>(browser_context, guest_instance_id),
+      app_view_guest_delegate_(app_view_guest_delegate),
       weak_ptr_factory_(this) {
 }
 
 AppViewGuest::~AppViewGuest() {
 }
 
 WindowController* AppViewGuest::GetExtensionWindowController() const {
   return NULL;
 }
 
 content::WebContents* AppViewGuest::GetAssociatedWebContents() const {
   return guest_web_contents();
 }
 
 bool AppViewGuest::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AppViewGuest, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) {
-  ContextMenuDelegate* menu_delegate =
-      ContextMenuDelegate::FromWebContents(guest_web_contents());
-  DCHECK(menu_delegate);
-
-  scoped_ptr<RenderViewContextMenu> menu =
-      menu_delegate->BuildMenu(guest_web_contents(), params);
-  menu_delegate->ShowMenu(menu.Pass());
-  return true;
+  return app_view_guest_delegate_->HandleContextMenu(guest_web_contents(),
+                                                     params);
 }
 
 const char* AppViewGuest::GetAPINamespace() {
   return appview::kEmbedderAPINamespace;
 }
 
 void AppViewGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
   std::string app_id;
   if (!create_params.GetString(appview::kAppID, &app_id)) {
     callback.Run(NULL);
     return;
   }
 
   const base::DictionaryValue* data = NULL;
   if (!create_params.GetDictionary(appview::kData, &data)) {
     callback.Run(NULL);
     return;
   }
 
-  ExtensionService* service =
-      ExtensionSystem::Get(browser_context())->extension_service();
-  const Extension* guest_extension = service->GetExtensionById(app_id, false);
+  const Extension* guest_extension = app_view_guest_delegate_->GetExtensionById(

[Xi Han, 2014/08/18 21:29:11]

This part doesn't need to be moved to delegate, since the const Extensions*
embedder_extension can be obtained through ExtensionRegistry::GetExtensionById()
function, which exists in extensions. The code will look like:

ExtensionRegistry::Get()->GetExtensionById(id, ExtensionRegistry::ENABLED);

+      browser_context(), app_id, false);
   const Extension* embedder_extension =
-      service->GetExtensionById(embedder_extension_id, false);
+      app_view_guest_delegate_->GetExtensionById(
+          browser_context(), embedder_extension_id, false);
 
   if (!guest_extension || !guest_extension->is_platform_app() ||
       !embedder_extension | !embedder_extension->is_platform_app()) {
     callback.Run(NULL);
     return;
   }
 
   pending_response_map.Get().insert(
       std::make_pair(GetGuestInstanceID(),
                      make_linked_ptr(new ResponseInfo(
@@ skipping 75 matching lines @@
 
   scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());
   embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());
   embed_request->SetString(appview::kEmbedderID, embedder_extension_id());
   embed_request->Set(appview::kData, data.release());
   AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
       browser_context(), embed_request.Pass(), extension_host->extension());
 }
 
 }  // namespace extensions