Convert app banners to use Mojo.

chrome/renderer/chrome_render_frame_observer.cc

 // Copyright 2013 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/renderer/chrome_render_frame_observer.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_isolated_world_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "components/translate/content/renderer/translate_helper.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/geometry/size_f.h"
@@ skipping 56 matching lines @@
   }
 
   return skia::ImageOperations::Resize(image.getSkBitmap(),
                                        skia::ImageOperations::RESIZE_GOOD,
                                        static_cast<int>(scaled_size.width()),
                                        static_cast<int>(scaled_size.height()));
 }
 
 }  // namespace
 
+// static
+void ChromeRenderFrameObserver::BindBannerClient(
+      ChromeRenderFrameObserver* observer,
+      mojo::InterfaceRequest<blink::mojom::AppBannerClient> request) {
+  observer->banner_binding_.reset(

[dcheng, 2016/10/07 07:03:16]

Nit: I think this can be replaced with Binding::Close() and then
Binding::Bind(std::move(request))

[dominickn, 2016/10/13 00:18:15]

Done.

+      new mojo::Binding<blink::mojom::AppBannerClient>(observer,
+                                                       std::move(request)));
+}
+
 ChromeRenderFrameObserver::ChromeRenderFrameObserver(
     content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame),
       translate_helper_(nullptr),
       phishing_classifier_(nullptr) {
   // Don't do anything for subframes.
   if (!render_frame->IsMainFrame())
     return;
 
   const base::CommandLine& command_line =
@@ skipping 22 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewMsg_RequestReloadImageForContextNode,
                         OnRequestReloadImageForContextNode)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_RequestThumbnailForContextNode,
                         OnRequestThumbnailForContextNode)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetClientSidePhishingDetection,
                         OnSetClientSidePhishingDetection)
 #if defined(ENABLE_PRINTING)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintNodeUnderContextMenu,
                         OnPrintNodeUnderContextMenu)
 #endif
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_AppBannerPromptRequest,
-                        OnAppBannerPromptRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void ChromeRenderFrameObserver::OnSetIsPrerendering(
     prerender::PrerenderMode mode) {
   if (mode != prerender::NO_PRERENDER) {
     // If the PrerenderHelper for this frame already exists, don't create it. It
@@ skipping 69 matching lines @@
     bool enable_phishing_detection) {
 #if defined(SAFE_BROWSING_CSD)
   phishing_classifier_ =
       enable_phishing_detection
           ? safe_browsing::PhishingClassifierDelegate::Create(render_frame(),
                                                               nullptr)
           : nullptr;
 #endif
 }
 
-void ChromeRenderFrameObserver::OnAppBannerPromptRequest(
-    int request_id,
-    const std::string& platform) {
-  // App banner prompt requests are handled in the general chrome render frame
-  // observer, not the AppBannerClient, as the AppBannerClient is created lazily
-  // by blink and may not exist when the request is sent.
-  blink::WebAppBannerPromptReply reply = blink::WebAppBannerPromptReply::None;
+void ChromeRenderFrameObserver::BannerPromptRequest(
+    blink::mojom::AppBannerServicePtr banner_service,
+    blink::mojom::AppBannerEventRequest event_request,
+    const std::string& platform,
+    const BannerPromptRequestCallback& callback) {
+  // Break up the InterfacePtr and InterfaceRequest so they can be passed
+  // through to Blink as ScopedMessagePipeHandle. They will be reconstituted on
+  // the other side.

[dcheng, 2016/10/07 07:03:16]

Maybe put a TODO here that we should be able to get rid of this eventually
(hopefully?)

+  mojo::ScopedMessagePipeHandle service_handle =
+      banner_service.PassInterface().PassHandle();
+  mojo::ScopedMessagePipeHandle event_handle = event_request.PassMessagePipe();
+
+  blink::mojom::AppBannerPromptReply reply =
+      blink::mojom::AppBannerPromptReply::NONE;
   blink::WebString web_platform(base::UTF8ToUTF16(platform));
   blink::WebVector<blink::WebString> web_platforms(&web_platform, 1);
 
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
-  frame->willShowInstallBannerPrompt(request_id, web_platforms, &reply);
+  frame->willShowInstallBannerPrompt(std::move(service_handle),
+                                     std::move(event_handle), web_platforms,
+                                     &reply);
 
   // Extract the referrer header for this site according to its referrer policy.
   // Pass in an empty URL as the destination so that it is always treated
   // as a cross-origin request.
   std::string referrer = blink::WebSecurityPolicy::generateReferrerHeader(
       frame->document().referrerPolicy(), GURL(),
       frame->document().outgoingReferrer()).utf8();
 
-  Send(new ChromeViewHostMsg_AppBannerPromptReply(
-      routing_id(), request_id, reply, referrer));
+  callback.Run(reply, referrer);
 }
 
 void ChromeRenderFrameObserver::DidFinishLoad() {
   WebLocalFrame* frame = render_frame()->GetWebFrame();
   // Don't do anything for subframes.
   if (frame->parent())
     return;
 
   GURL osdd_url = frame->document().openSearchDescriptionURL();
   if (!osdd_url.is_empty()) {
@@ skipping 89 matching lines @@
       CapturePageText(FINAL_CAPTURE);
       break;
     default:
       break;
   }
 }
 
 void ChromeRenderFrameObserver::OnDestruct() {
   delete this;
 }