| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_blink_platform_impl.h" | 5 #include "content/renderer/renderer_blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 blink::WebMIDIAccessor* accessor = | 800 blink::WebMIDIAccessor* accessor = |
| 801 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); | 801 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); |
| 802 if (accessor) | 802 if (accessor) |
| 803 return accessor; | 803 return accessor; |
| 804 | 804 |
| 805 return new RendererWebMIDIAccessorImpl(client); | 805 return new RendererWebMIDIAccessorImpl(client); |
| 806 } | 806 } |
| 807 | 807 |
| 808 void RendererBlinkPlatformImpl::getPluginList( | 808 void RendererBlinkPlatformImpl::getPluginList( |
| 809 bool refresh, | 809 bool refresh, |
| 810 const blink::WebSecurityOrigin& mainFrameOrigin, |
| 810 blink::WebPluginListBuilder* builder) { | 811 blink::WebPluginListBuilder* builder) { |
| 811 #if defined(ENABLE_PLUGINS) | 812 #if defined(ENABLE_PLUGINS) |
| 812 std::vector<WebPluginInfo> plugins; | 813 std::vector<WebPluginInfo> plugins; |
| 813 if (!plugin_refresh_allowed_) | 814 if (!plugin_refresh_allowed_) |
| 814 refresh = false; | 815 refresh = false; |
| 815 RenderThread::Get()->Send(new FrameHostMsg_GetPlugins(refresh, &plugins)); | 816 RenderThread::Get()->Send( |
| 817 new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins)); |
| 816 for (const WebPluginInfo& plugin : plugins) { | 818 for (const WebPluginInfo& plugin : plugins) { |
| 817 builder->addPlugin( | 819 builder->addPlugin( |
| 818 plugin.name, plugin.desc, | 820 plugin.name, plugin.desc, |
| 819 plugin.path.BaseName().AsUTF16Unsafe()); | 821 plugin.path.BaseName().AsUTF16Unsafe()); |
| 820 | 822 |
| 821 for (const WebPluginMimeType& mime_type : plugin.mime_types) { | 823 for (const WebPluginMimeType& mime_type : plugin.mime_types) { |
| 822 builder->addMediaTypeToLastPlugin( | 824 builder->addMediaTypeToLastPlugin( |
| 823 WebString::fromUTF8(mime_type.mime_type), mime_type.description); | 825 WebString::fromUTF8(mime_type.mime_type), mime_type.description); |
| 824 | 826 |
| 825 for (const auto& extension : mime_type.file_extensions) { | 827 for (const auto& extension : mime_type.file_extensions) { |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1317 return &trial_token_validator_; | 1319 return &trial_token_validator_; |
| 1318 } | 1320 } |
| 1319 | 1321 |
| 1320 void RendererBlinkPlatformImpl::workerContextCreated( | 1322 void RendererBlinkPlatformImpl::workerContextCreated( |
| 1321 const v8::Local<v8::Context>& worker) { | 1323 const v8::Local<v8::Context>& worker) { |
| 1322 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( | 1324 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( |
| 1323 worker); | 1325 worker); |
| 1324 } | 1326 } |
| 1325 | 1327 |
| 1326 } // namespace content | 1328 } // namespace content |
| OLD | NEW |