Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: ios/web/webui/crw_web_ui_manager.mm

Issue 2744963002: Introduce InterfaceEndpointClient(IEC), InterfaceEndpointHandle and (Closed)
Patch Set: Resolve Merge with new changes from master. Created 3 years, 9 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/web/webui/crw_web_ui_manager.h" 5 #import "ios/web/webui/crw_web_ui_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/string_escape.h" 10 #include "base/json/string_escape.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 {mojo::kControlMessageHandlerModuleName, 219 {mojo::kControlMessageHandlerModuleName,
220 IDR_MOJO_CONTROL_MESSAGE_HANDLER_JS}, 220 IDR_MOJO_CONTROL_MESSAGE_HANDLER_JS},
221 {mojo::kControlMessageProxyModuleName, IDR_MOJO_CONTROL_MESSAGE_PROXY_JS}, 221 {mojo::kControlMessageProxyModuleName, IDR_MOJO_CONTROL_MESSAGE_PROXY_JS},
222 {mojo::kInterfaceControlMessagesMojom, 222 {mojo::kInterfaceControlMessagesMojom,
223 IDR_MOJO_INTERFACE_CONTROL_MESSAGES_MOJOM_JS}, 223 IDR_MOJO_INTERFACE_CONTROL_MESSAGES_MOJOM_JS},
224 {mojo::kInterfaceTypesModuleName, IDR_MOJO_INTERFACE_TYPES_JS}, 224 {mojo::kInterfaceTypesModuleName, IDR_MOJO_INTERFACE_TYPES_JS},
225 {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS}, 225 {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS},
226 {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS}, 226 {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS},
227 {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS}, 227 {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS},
228 {web::kConsoleModuleName, IDR_IOS_CONSOLE_JS}, 228 {web::kConsoleModuleName, IDR_IOS_CONSOLE_JS},
229 {web::kTimerModuleName, IDR_IOS_TIMER_JS},
229 {web::kCoreModuleName, IDR_IOS_MOJO_CORE_JS}, 230 {web::kCoreModuleName, IDR_IOS_MOJO_CORE_JS},
230 {web::kHandleUtilModuleName, IDR_IOS_MOJO_HANDLE_UTIL_JS}, 231 {web::kHandleUtilModuleName, IDR_IOS_MOJO_HANDLE_UTIL_JS},
231 {web::kInterfaceProviderModuleName, IDR_IOS_SHELL_INTERFACE_PROVIDER_JS}, 232 {web::kInterfaceProviderModuleName, IDR_IOS_SHELL_INTERFACE_PROVIDER_JS},
232 {web::kSupportModuleName, IDR_IOS_MOJO_SUPPORT_JS}, 233 {web::kSupportModuleName, IDR_IOS_MOJO_SUPPORT_JS},
233 {web::kSyncMessageChannelModuleName, 234 {web::kSyncMessageChannelModuleName,
234 IDR_IOS_MOJO_SYNC_MESSAGE_CHANNEL_JS}, 235 IDR_IOS_MOJO_SYNC_MESSAGE_CHANNEL_JS},
236 {mojo::kPipeControlMessagesMojom, IDR_MOJO_PIPE_CONTROL_MESSAGES_MOJOM_JS} ,
Eugene But (OOO till 7-30) 2017/03/20 20:53:46 This like exceeds allowed character width. Please
wangjimmy 2017/03/21 16:53:37 Done.
237 {mojo::kInterfaceEndpointClientModuleName, IDR_MOJO_INTERFACE_ENDPOINT_CLI ENT_JS},
238 {mojo::kInterfaceEndpointHandleModuleName, IDR_MOJO_INTERFACE_ENDPOINT_HAN DLE_JS},
239 {mojo::kPipeControlMessageHandlerModuleName, IDR_MOJO_PIPE_CONTROL_MESSAGE _HANDLER_JS},
240 {mojo::kPipeControlMessageProxyModuleName, IDR_MOJO_PIPE_CONTROL_MESSAGE_P ROXY_JS},
235 }; 241 };
236 scoped_refptr<base::RefCountedMemory> scriptData( 242 scoped_refptr<base::RefCountedMemory> scriptData(
237 web::GetWebClient()->GetDataResourceBytes(resource_map[moduleName])); 243 web::GetWebClient()->GetDataResourceBytes(resource_map[moduleName]));
238 if (scriptData) { 244 if (scriptData) {
239 std::string script(reinterpret_cast<const char*>(scriptData->front()), 245 std::string script(reinterpret_cast<const char*>(scriptData->front()),
240 scriptData->size()); 246 scriptData->size());
241 [self executeMojoScript:script forModuleName:moduleName loadID:loadID]; 247 [self executeMojoScript:script forModuleName:moduleName loadID:loadID];
242 return YES; 248 return YES;
243 } 249 }
244 250
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 #pragma mark - Testing-Only Methods 312 #pragma mark - Testing-Only Methods
307 313
308 - (std::unique_ptr<web::URLFetcherBlockAdapter>) 314 - (std::unique_ptr<web::URLFetcherBlockAdapter>)
309 fetcherForURL:(const GURL&)URL 315 fetcherForURL:(const GURL&)URL
310 completionHandler:(web::URLFetcherBlockAdapterCompletion)handler { 316 completionHandler:(web::URLFetcherBlockAdapterCompletion)handler {
311 return base::MakeUnique<web::URLFetcherBlockAdapter>( 317 return base::MakeUnique<web::URLFetcherBlockAdapter>(
312 URL, _webState->GetBrowserState()->GetRequestContext(), handler); 318 URL, _webState->GetBrowserState()->GetRequestContext(), handler);
313 } 319 }
314 320
315 @end 321 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698