Chromium Code Reviews| 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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 798 blink::WebMIDIAccessor* accessor = | 798 blink::WebMIDIAccessor* accessor = |
| 799 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); | 799 GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); |
| 800 if (accessor) | 800 if (accessor) |
| 801 return accessor; | 801 return accessor; |
| 802 | 802 |
| 803 return new RendererWebMIDIAccessorImpl(client); | 803 return new RendererWebMIDIAccessorImpl(client); |
| 804 } | 804 } |
| 805 | 805 |
| 806 void RendererBlinkPlatformImpl::getPluginList( | 806 void RendererBlinkPlatformImpl::getPluginList( |
| 807 bool refresh, | 807 bool refresh, |
| 808 const blink::WebSecurityOrigin& mainFrameOrigin, | |
| 808 blink::WebPluginListBuilder* builder) { | 809 blink::WebPluginListBuilder* builder) { |
| 809 #if defined(ENABLE_PLUGINS) | 810 #if defined(ENABLE_PLUGINS) |
| 810 std::vector<WebPluginInfo> plugins; | 811 std::vector<WebPluginInfo> plugins; |
| 811 if (!plugin_refresh_allowed_) | 812 if (!plugin_refresh_allowed_) |
| 812 refresh = false; | 813 refresh = false; |
| 813 RenderThread::Get()->Send(new FrameHostMsg_GetPlugins(refresh, &plugins)); | 814 url::Origin main_frame_origin = url::Origin(mainFrameOrigin); |
|
alexmos
2016/08/04 05:32:03
Does "url::Origin main_frame_origin(mainFrameOrigi
trizzofo
2016/08/05 02:04:26
Done. Thanks!
| |
| 815 RenderThread::Get()->Send( | |
| 816 new FrameHostMsg_GetPlugins(refresh, main_frame_origin, &plugins)); | |
| 814 for (const WebPluginInfo& plugin : plugins) { | 817 for (const WebPluginInfo& plugin : plugins) { |
| 815 builder->addPlugin( | 818 builder->addPlugin( |
| 816 plugin.name, plugin.desc, | 819 plugin.name, plugin.desc, |
| 817 plugin.path.BaseName().AsUTF16Unsafe()); | 820 plugin.path.BaseName().AsUTF16Unsafe()); |
| 818 | 821 |
| 819 for (const WebPluginMimeType& mime_type : plugin.mime_types) { | 822 for (const WebPluginMimeType& mime_type : plugin.mime_types) { |
| 820 builder->addMediaTypeToLastPlugin( | 823 builder->addMediaTypeToLastPlugin( |
| 821 WebString::fromUTF8(mime_type.mime_type), mime_type.description); | 824 WebString::fromUTF8(mime_type.mime_type), mime_type.description); |
| 822 | 825 |
| 823 for (const auto& extension : mime_type.file_extensions) { | 826 for (const auto& extension : mime_type.file_extensions) { |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1316 return &trial_token_validator_; | 1319 return &trial_token_validator_; |
| 1317 } | 1320 } |
| 1318 | 1321 |
| 1319 void RendererBlinkPlatformImpl::workerContextCreated( | 1322 void RendererBlinkPlatformImpl::workerContextCreated( |
| 1320 const v8::Local<v8::Context>& worker) { | 1323 const v8::Local<v8::Context>& worker) { |
| 1321 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( | 1324 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( |
| 1322 worker); | 1325 worker); |
| 1323 } | 1326 } |
| 1324 | 1327 |
| 1325 } // namespace content | 1328 } // namespace content |
| OLD | NEW |