chrome/browser/chrome_content_browser_client.cc - Issue 2620083002: Shape Detection: Move mojom interface to //services

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2620083002: Shape Detection: Move mojom interface to //services (Closed)

Patch Set: Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 62af2d512a5e24dcbab2198a2e39430e2a3f91bb..59c0105b8588c85460f1070bd09e44448a4ab795 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -202,9 +202,9 @@

#include "services/service_manager/public/cpp/interface_provider.h"

#include "services/service_manager/public/cpp/interface_registry.h"

#include "services/service_manager/public/cpp/service.h"

+#include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"

+#include "services/shape_detection/public/interfaces/textdetection.mojom.h"

#include "storage/browser/fileapi/external_mount_points.h"

-#include "third_party/WebKit/public/platform/modules/shapedetection/barcodedetection.mojom.h"

-#include "third_party/WebKit/public/platform/modules/shapedetection/textdetection.mojom.h"

#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -3004,7 +3004,11 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(

if (AreExperimentalWebPlatformFeaturesEnabled()) {

registry->AddInterface(

web_contents->GetJavaInterfaces()

- ->CreateInterfaceFactory<blink::mojom::BarcodeDetection>());

+ ->CreateInterfaceFactory<

+ shape_detection::mojom::BarcodeDetection>());

+ registry->AddInterface(web_contents->GetJavaInterfaces()

+ ->CreateInterfaceFactory<

+ shape_detection::mojom::TextDetection>());

mcasas 2017/01/10 22:20:32 TextDetection registration is already in ToT. Wron

}

#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)

« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_content_browser_manifest_overlay.json » ('j') | no next file with comments »