Chromium Code Reviews| 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 dec12786c2078d96e77f49ccd6b2aab1420fc7c3..5fd6c1be74b3feec91ce97562018b9c9b75c0510 100644 |
| --- a/chrome/browser/chrome_content_browser_client.cc |
| +++ b/chrome/browser/chrome_content_browser_client.cc |
| @@ -201,8 +201,6 @@ |
| #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/webshare/webshare.mojom.h" |
| #include "ui/base/l10n/l10n_util.h" |
| @@ -1445,8 +1443,7 @@ bool IsAutoReloadVisibleOnlyEnabled() { |
| return true; |
| } |
| -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ |
| - defined(OS_ANDROID) |
|
mcasas
2017/01/18 02:05:10
nit: is this your changes or a side effect of some
xianglu
2017/01/18 02:22:30
I removed this because otherwise AreExperimentalWe
|
| +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) |
| bool AreExperimentalWebPlatformFeaturesEnabled() { |
| const base::CommandLine& browser_command_line = |
| *base::CommandLine::ForCurrentProcess(); |
| @@ -3001,15 +2998,6 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( |
| registry->AddInterface( |
| base::Bind(&ForwardShareServiceRequest, |
| web_contents->GetJavaInterfaces()->GetWeakPtr())); |
| - if (AreExperimentalWebPlatformFeaturesEnabled()) { |
| - registry->AddInterface( |
| - web_contents->GetJavaInterfaces() |
| - ->CreateInterfaceFactory< |
| - shape_detection::mojom::BarcodeDetection>()); |
| - registry->AddInterface(web_contents->GetJavaInterfaces() |
| - ->CreateInterfaceFactory< |
| - shape_detection::mojom::TextDetection>()); |
| - } |
| } |
| #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) |
| // TODO(crbug.com/679127): Enable for MacViews implementation. |