From be477b99b4dd88ca5415cb1794789e8deb001a61 Mon Sep 17 00:00:00 2001 From: eugenebut Date: Thu, 2 Jun 2016 19:36:56 -0700 Subject: [PATCH] [ios Mojo] Renamed service provider to service registry. This name matches other platforms, which made the change here: https://codereview.chromium.org/1827473002 BUG=None Review-Url: https://codereview.chromium.org/2031893003 Cr-Commit-Position: refs/heads/master@{#397589} --- ios/web/ios_web_resources.grd | 2 +- ios/web/test/data/mojo_test.js | 6 +++--- ios/web/webui/crw_web_ui_manager.mm | 2 +- ios/web/webui/mojo_js_constants.cc | 4 ++-- ios/web/webui/mojo_js_constants.h | 2 +- .../resources/{service_provider.js => service_registry.js} | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename ios/web/webui/resources/{service_provider.js => service_registry.js} (89%) diff --git a/ios/web/ios_web_resources.grd b/ios/web/ios_web_resources.grd index 5fc433fe6eb928..8ed0e49c979031 100644 --- a/ios/web/ios_web_resources.grd +++ b/ios/web/ios_web_resources.grd @@ -21,7 +21,7 @@ - + diff --git a/ios/web/test/data/mojo_test.js b/ios/web/test/data/mojo_test.js index 2de75fb8d53e40..8acf16760d3bc3 100644 --- a/ios/web/test/data/mojo_test.js +++ b/ios/web/test/data/mojo_test.js @@ -13,8 +13,8 @@ define('main', [ 'mojo/public/js/core', 'mojo/public/js/connection', 'ios/web/test/mojo_test.mojom', - 'content/public/renderer/service_provider', -], function(bindings, core, connection, browser, serviceProvider) { + 'content/public/renderer/frame_service_registry', +], function(bindings, core, connection, browser, serviceRegistry) { var page; @@ -52,7 +52,7 @@ define('main', [ return function() { var browserProxy = connection.bindHandleToProxy( - serviceProvider.connectToService(browser.TestUIHandlerMojo.name), + serviceRegistry.connectToService(browser.TestUIHandlerMojo.name), browser.TestUIHandlerMojo); page = new TestPageImpl(browserProxy); diff --git a/ios/web/webui/crw_web_ui_manager.mm b/ios/web/webui/crw_web_ui_manager.mm index 531ec221df6c2a..43578e91dbddab 100644 --- a/ios/web/webui/crw_web_ui_manager.mm +++ b/ios/web/webui/crw_web_ui_manager.mm @@ -257,7 +257,7 @@ - (BOOL)handleLoadMojo:(const base::ListValue*)arguments { {web::kHandleUtilModuleName, IDR_IOS_MOJO_HANDLE_UTIL_JS}, {web::kSupportModuleName, IDR_IOS_MOJO_SUPPORT_JS}, {web::kCoreModuleName, IDR_IOS_MOJO_CORE_JS}, - {web::kServiceProviderModuleName, IDR_IOS_MOJO_SERVICE_PROVIDER_JS}, + {web::kServiceRegistryModuleName, IDR_IOS_MOJO_SERVICE_REGISTRY_JS}, }; scoped_refptr scriptData( web::GetWebClient()->GetDataResourceBytes(resource_map[moduleName])); diff --git a/ios/web/webui/mojo_js_constants.cc b/ios/web/webui/mojo_js_constants.cc index 711e73d4af36d6..05e1a78b8d813e 100644 --- a/ios/web/webui/mojo_js_constants.cc +++ b/ios/web/webui/mojo_js_constants.cc @@ -11,7 +11,7 @@ const char kSyncMessageChannelModuleName[] = const char kHandleUtilModuleName[] = "ios/mojo/public/js/handle_util"; const char kSupportModuleName[] = "mojo/public/js/support"; const char kCoreModuleName[] = "mojo/public/js/core"; -const char kServiceProviderModuleName[] = - "content/public/renderer/service_provider"; +const char kServiceRegistryModuleName[] = + "content/public/renderer/frame_service_registry"; } // namespace web diff --git a/ios/web/webui/mojo_js_constants.h b/ios/web/webui/mojo_js_constants.h index 81a219398cb022..603af54ccca18e 100644 --- a/ios/web/webui/mojo_js_constants.h +++ b/ios/web/webui/mojo_js_constants.h @@ -11,7 +11,7 @@ extern const char kSyncMessageChannelModuleName[]; extern const char kHandleUtilModuleName[]; extern const char kSupportModuleName[]; extern const char kCoreModuleName[]; -extern const char kServiceProviderModuleName[]; +extern const char kServiceRegistryModuleName[]; } // namespace web diff --git a/ios/web/webui/resources/service_provider.js b/ios/web/webui/resources/service_registry.js similarity index 89% rename from ios/web/webui/resources/service_provider.js rename to ios/web/webui/resources/service_registry.js index ff1ecc0a44c23f..19ce466ace48d2 100644 --- a/ios/web/webui/resources/service_provider.js +++ b/ios/web/webui/resources/service_registry.js @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Module "content/public/renderer/service_provider" +// Module "content/public/renderer/frame_service_registry" // // This module provides the JavaScript bindings for // services/shell/public/cpp/connection.h. // Refer to that file for more detailed documentation for equivalent methods. -define("content/public/renderer/service_provider", [ +define("content/public/renderer/frame_service_registry", [ "ios/mojo/public/js/sync_message_channel", "ios/mojo/public/js/handle_util", ], function(syncMessageChannel, handleUtil) {