[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.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/web_view/chrome_web_view_guest_delegate.h"
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/browsing_data/storage_partition_http_cache_data_remover.h"
 #include "components/guest_view/browser/guest_view_event.h"
-#include "components/pdf/browser/pdf_web_contents_helper.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 
-#if defined(ENABLE_PRINTING)
-#if defined(ENABLE_PRINT_PREVIEW)
-#include "chrome/browser/printing/print_preview_message_handler.h"
-#include "chrome/browser/printing/print_view_manager.h"
-#else
-#include "chrome/browser/printing/print_view_manager_basic.h"
-#endif  // defined(ENABLE_PRINT_PREVIEW)
-#endif  // defined(ENABLE_PRINTING)
-
 using guest_view::GuestViewEvent;
 
 namespace extensions {
 
 ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
     WebViewGuest* web_view_guest)
     : pending_context_menu_request_id_(0),
       chromevox_injected_(false),
       web_view_guest_(web_view_guest),
       weak_ptr_factory_(this) {
@@ skipping 20 matching lines @@
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   scoped_ptr<base::ListValue> items =
       MenuModelToValue(pending_menu_->menu_model());
   args->Set(webview::kContextMenuItems, items.release());
   args->SetInteger(webview::kRequestId, request_id);
   web_view_guest()->DispatchEventToView(
       new GuestViewEvent(webview::kEventContextMenuShow, args.Pass()));
   return true;
 }
 
-// TODO(hanxi) Investigate which of these observers should move to the
-// extension module in the future.
-void ChromeWebViewGuestDelegate::OnAttachWebViewHelpers(
-    content::WebContents* contents) {
-  favicon::CreateContentFaviconDriverForWebContents(contents);
-  ChromeExtensionWebContentsObserver::CreateForWebContents(contents);
-#if defined(ENABLE_PRINTING)
-#if defined(ENABLE_PRINT_PREVIEW)
-  printing::PrintViewManager::CreateForWebContents(contents);
-  printing::PrintPreviewMessageHandler::CreateForWebContents(contents);
-#else
-  printing::PrintViewManagerBasic::CreateForWebContents(contents);
-#endif  // defined(ENABLE_PRINT_PREVIEW)
-#endif  // defined(ENABLE_PRINTING)
-  pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
-      contents,
-      scoped_ptr<pdf::PDFWebContentsHelperClient>(
-          new ChromePDFWebContentsHelperClient()));
-}

[Fady Samuel, 2015/06/10 20:51:18]

Wow, have you moved all of this into extensions? I don't see them. Did I miss
something?

[Devlin, 2015/06/10 20:59:20]

This all moved into the ChromeExtensionAPIClient::AttachWebContentsHandlers()
method, which is called from each guest view type.

-
 void ChromeWebViewGuestDelegate::OnDidInitialize() {
 #if defined(OS_CHROMEOS)
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&ChromeWebViewGuestDelegate::OnAccessibilityStatusChanged,
                  weak_ptr_factory_.GetWeakPtr()));
 #endif
 }
@@ skipping 64 matching lines @@
       chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
     if (details.enabled)
       InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
     else
       chromevox_injected_ = false;
   }
 }
 #endif
 
 }  // namespace extensions