OLD | NEW |
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 2628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2639 mojo::edk::js::Core::GetModule(isolate)); | 2639 mojo::edk::js::Core::GetModule(isolate)); |
2640 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, | 2640 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, |
2641 mojo::edk::js::Support::GetModule(isolate)); | 2641 mojo::edk::js::Support::GetModule(isolate)); |
2642 registry->AddBuiltinModule( | 2642 registry->AddBuiltinModule( |
2643 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, | 2643 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, |
2644 InterfaceProviderJsWrapper::Create( | 2644 InterfaceProviderJsWrapper::Create( |
2645 isolate, context, remote_interfaces_.get()) | 2645 isolate, context, remote_interfaces_.get()) |
2646 .ToV8()); | 2646 .ToV8()); |
2647 registry->AddBuiltinModule( | 2647 registry->AddBuiltinModule( |
2648 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, | 2648 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, |
2649 InterfaceProviderJsWrapper::Create( | 2649 InterfaceProviderJsWrapper::Create(isolate, context, |
2650 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) | 2650 RenderThread::Get()->GetConnector()) |
2651 .ToV8()); | 2651 .ToV8()); |
2652 } | 2652 } |
2653 | 2653 |
2654 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, | 2654 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, |
2655 const std::string& message) { | 2655 const std::string& message) { |
2656 blink::WebConsoleMessage::Level target_level = | 2656 blink::WebConsoleMessage::Level target_level = |
2657 blink::WebConsoleMessage::LevelInfo; | 2657 blink::WebConsoleMessage::LevelInfo; |
2658 switch (level) { | 2658 switch (level) { |
2659 case CONSOLE_MESSAGE_LEVEL_VERBOSE: | 2659 case CONSOLE_MESSAGE_LEVEL_VERBOSE: |
2660 target_level = blink::WebConsoleMessage::LevelVerbose; | 2660 target_level = blink::WebConsoleMessage::LevelVerbose; |
(...skipping 4271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6932 policy(info.defaultPolicy), | 6932 policy(info.defaultPolicy), |
6933 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6933 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6934 history_navigation_in_new_child_frame( | 6934 history_navigation_in_new_child_frame( |
6935 info.isHistoryNavigationInNewChildFrame), | 6935 info.isHistoryNavigationInNewChildFrame), |
6936 client_redirect(info.isClientRedirect), | 6936 client_redirect(info.isClientRedirect), |
6937 cache_disabled(info.isCacheDisabled), | 6937 cache_disabled(info.isCacheDisabled), |
6938 form(info.form), | 6938 form(info.form), |
6939 source_location(info.sourceLocation) {} | 6939 source_location(info.sourceLocation) {} |
6940 | 6940 |
6941 } // namespace content | 6941 } // namespace content |
OLD | NEW |