From 96ba6d57c1d5d7ef4f73654d71c17a9b20edc05a Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 18 Oct 2016 10:04:36 -0700 Subject: [PATCH] Remove clipboard mojo service (flutter/engine#3143) All the clients have migrated to platform messages. --- .../platform/android/io/flutter/view/FlutterMain.java | 9 --------- .../platform/darwin/common/platform_service_provider.cc | 6 ------ 2 files changed, 15 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java index 99954ed406..9ee102e00a 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java @@ -34,9 +34,7 @@ import org.chromium.mojo.bindings.Interface.Binding; import org.chromium.mojo.system.Core; import org.chromium.mojo.system.impl.CoreImpl; import org.chromium.mojo.system.MessagePipeHandle; -import org.chromium.mojom.editing.Clipboard; import org.chromium.mojom.vsync.VSyncProvider; -import org.domokit.editing.ClipboardImpl; import org.domokit.vsync.VSyncProviderImpl; /** @@ -182,13 +180,6 @@ public class FlutterMain { private static native void nativeRecordStartTimestamp(long initTimeMillis); private static void onServiceRegistryAvailable(final Context applicationContext, ServiceRegistry registry) { - registry.register(Clipboard.MANAGER.getName(), new ServiceFactory() { - @Override - public Binding connectToService(FlutterView view, Core core, MessagePipeHandle pipe) { - return Clipboard.MANAGER.bind(new ClipboardImpl(view.getContext()), pipe); - } - }); - registry.register(VSyncProvider.MANAGER.getName(), new ServiceFactory() { @Override public Binding connectToService(FlutterView view, Core core, MessagePipeHandle pipe) { diff --git a/engine/src/flutter/shell/platform/darwin/common/platform_service_provider.cc b/engine/src/flutter/shell/platform/darwin/common/platform_service_provider.cc index 7b87525a7f..45c58e36e7 100644 --- a/engine/src/flutter/shell/platform/darwin/common/platform_service_provider.cc +++ b/engine/src/flutter/shell/platform/darwin/common/platform_service_provider.cc @@ -5,7 +5,6 @@ #include "flutter/shell/platform/darwin/common/platform_service_provider.h" #if TARGET_OS_IPHONE -#include "flutter/services/editing/ios/clipboard_impl.h" #include "flutter/services/vsync/ios/vsync_provider_ios_impl.h" #else #include "flutter/services/vsync/mac/vsync_provider_mac_impl.h" @@ -23,11 +22,6 @@ void PlatformServiceProvider::ConnectToService( const mojo::String& service_name, mojo::ScopedMessagePipeHandle client_handle) { #if TARGET_OS_IPHONE - if (service_name == ::editing::Clipboard::Name_) { - new sky::services::editing::ClipboardImpl( - mojo::InterfaceRequest<::editing::Clipboard>(client_handle.Pass())); - return; - } if (service_name == ::vsync::VSyncProvider::Name_) { new sky::services::vsync::VsyncProviderIOSImpl( mojo::InterfaceRequest<::vsync::VSyncProvider>(client_handle.Pass()));