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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1827473002: Make the process-wide ServiceRegistry available to JS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2313 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); 2313 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context);
2314 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) 2314 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName))
2315 return; 2315 return;
2316 2316
2317 v8::HandleScope handle_scope(isolate); 2317 v8::HandleScope handle_scope(isolate);
2318 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, 2318 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName,
2319 mojo::edk::js::Core::GetModule(isolate)); 2319 mojo::edk::js::Core::GetModule(isolate));
2320 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, 2320 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
2321 mojo::edk::js::Support::GetModule(isolate)); 2321 mojo::edk::js::Support::GetModule(isolate));
2322 registry->AddBuiltinModule( 2322 registry->AddBuiltinModule(
2323 isolate, ServiceRegistryJsWrapper::kModuleName, 2323 isolate, ServiceRegistryJsWrapper::kPerFrameModuleName,
2324 ServiceRegistryJsWrapper::Create(isolate, context, &service_registry_) 2324 ServiceRegistryJsWrapper::Create(isolate, context, &service_registry_)
2325 .ToV8()); 2325 .ToV8());
2326 registry->AddBuiltinModule(
2327 isolate, ServiceRegistryJsWrapper::kPerProcessModuleName,
2328 ServiceRegistryJsWrapper::Create(
2329 isolate, context, RenderThread::Get()->GetServiceRegistry())
2330 .ToV8());
2326 } 2331 }
2327 2332
2328 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, 2333 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
2329 const std::string& message) { 2334 const std::string& message) {
2330 if (devtools_agent_) 2335 if (devtools_agent_)
2331 devtools_agent_->AddMessageToConsole(level, message); 2336 devtools_agent_->AddMessageToConsole(level, message);
2332 } 2337 }
2333 2338
2334 bool RenderFrameImpl::IsUsingLoFi() const { 2339 bool RenderFrameImpl::IsUsingLoFi() const {
2335 return is_using_lofi_; 2340 return is_using_lofi_;
(...skipping 3665 matching lines...) Expand 10 before | Expand all | Expand 10 after
6001 int match_count, 6006 int match_count,
6002 int ordinal, 6007 int ordinal,
6003 const WebRect& selection_rect, 6008 const WebRect& selection_rect,
6004 bool final_status_update) { 6009 bool final_status_update) {
6005 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6010 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6006 selection_rect, ordinal, 6011 selection_rect, ordinal,
6007 final_status_update)); 6012 final_status_update));
6008 } 6013 }
6009 6014
6010 } // namespace content 6015 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698