Commit 224d78db authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert AppWindow in app_window.mojom to new Mojo types

This CL converts AppWindow in app_window.mojom using
PendingReceiver, Remote, and ReceiverSet.

Bug: 955171
Change-Id: I254824287a2dc520a8b1383bb34e9a829c7a9942
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846637Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#703678}
parent 79081496
......@@ -46,6 +46,7 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension_messages.h"
#include "extensions/common/mojom/app_window.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "printing/buildflags/buildflags.h"
#include "services/service_manager/public/cpp/interface_provider.h"
......@@ -323,8 +324,9 @@ void ChromeAppDelegate::SetWebContentsBlocked(
// RenderViewHost may be NULL during shutdown.
content::RenderFrameHost* host = web_contents->GetMainFrame();
if (host) {
extensions::mojom::AppWindowPtr app_window;
host->GetRemoteInterfaces()->GetInterface(&app_window);
mojo::Remote<extensions::mojom::AppWindow> app_window;
host->GetRemoteInterfaces()->GetInterface(
app_window.BindNewPipeAndPassReceiver());
app_window->SetVisuallyDeemphasized(blocked);
}
}
......
......@@ -84,16 +84,16 @@ ExtensionsRenderFrameObserver::ExtensionsRenderFrameObserver(
: content::RenderFrameObserver(render_frame),
webview_visually_deemphasized_(false) {
registry->AddInterface(
base::Bind(&ExtensionsRenderFrameObserver::BindAppWindowRequest,
base::Bind(&ExtensionsRenderFrameObserver::BindAppWindowReceiver,
base::Unretained(this)));
}
ExtensionsRenderFrameObserver::~ExtensionsRenderFrameObserver() {
}
void ExtensionsRenderFrameObserver::BindAppWindowRequest(
mojom::AppWindowRequest request) {
bindings_.AddBinding(this, std::move(request));
void ExtensionsRenderFrameObserver::BindAppWindowReceiver(
mojo::PendingReceiver<mojom::AppWindow> receiver) {
receivers_.Add(this, std::move(receiver));
}
void ExtensionsRenderFrameObserver::SetVisuallyDeemphasized(bool deemphasized) {
......
......@@ -10,7 +10,8 @@
#include "base/macros.h"
#include "content/public/renderer/render_frame_observer.h"
#include "extensions/common/mojom/app_window.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "services/service_manager/public/cpp/binder_registry.h"
namespace extensions {
......@@ -25,7 +26,7 @@ class ExtensionsRenderFrameObserver : public content::RenderFrameObserver,
~ExtensionsRenderFrameObserver() override;
private:
void BindAppWindowRequest(mojom::AppWindowRequest request);
void BindAppWindowReceiver(mojo::PendingReceiver<mojom::AppWindow> receiver);
// Toggles visual muting of the render view area. This is on when a
// constrained window is showing.
......@@ -42,7 +43,7 @@ class ExtensionsRenderFrameObserver : public content::RenderFrameObserver,
// true if webview is overlayed with grey color.
bool webview_visually_deemphasized_;
mojo::BindingSet<mojom::AppWindow> bindings_;
mojo::ReceiverSet<mojom::AppWindow> receivers_;
DISALLOW_COPY_AND_ASSIGN(ExtensionsRenderFrameObserver);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment