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

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

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/render_widget.cc ('k') | content/renderer/renderer_main.cc » ('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 (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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "gpu/command_buffer/client/gles2_interface.h" 73 #include "gpu/command_buffer/client/gles2_interface.h"
74 #include "gpu/config/gpu_info.h" 74 #include "gpu/config/gpu_info.h"
75 #include "gpu/ipc/client/gpu_channel_host.h" 75 #include "gpu/ipc/client/gpu_channel_host.h"
76 #include "gpu/ipc/common/gpu_stream_constants.h" 76 #include "gpu/ipc/common/gpu_stream_constants.h"
77 #include "ipc/ipc_sync_message_filter.h" 77 #include "ipc/ipc_sync_message_filter.h"
78 #include "media/audio/audio_output_device.h" 78 #include "media/audio/audio_output_device.h"
79 #include "media/blink/webcontentdecryptionmodule_impl.h" 79 #include "media/blink/webcontentdecryptionmodule_impl.h"
80 #include "media/filters/stream_parser_factory.h" 80 #include "media/filters/stream_parser_factory.h"
81 #include "mojo/common/common_type_converters.h" 81 #include "mojo/common/common_type_converters.h"
82 #include "mojo/public/cpp/bindings/associated_group.h" 82 #include "mojo/public/cpp/bindings/associated_group.h"
83 #include "ppapi/features/features.h"
83 #include "services/service_manager/public/cpp/interface_provider.h" 84 #include "services/service_manager/public/cpp/interface_provider.h"
84 #include "storage/common/database/database_identifier.h" 85 #include "storage/common/database/database_identifier.h"
85 #include "storage/common/quota/quota_types.h" 86 #include "storage/common/quota/quota_types.h"
86 #include "third_party/WebKit/public/platform/BlameContext.h" 87 #include "third_party/WebKit/public/platform/BlameContext.h"
87 #include "third_party/WebKit/public/platform/FilePathConversion.h" 88 #include "third_party/WebKit/public/platform/FilePathConversion.h"
88 #include "third_party/WebKit/public/platform/URLConversion.h" 89 #include "third_party/WebKit/public/platform/URLConversion.h"
89 #include "third_party/WebKit/public/platform/WebBlobRegistry.h" 90 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
90 #include "third_party/WebKit/public/platform/WebDeviceLightListener.h" 91 #include "third_party/WebKit/public/platform/WebDeviceLightListener.h"
91 #include "third_party/WebKit/public/platform/WebFileInfo.h" 92 #include "third_party/WebKit/public/platform/WebFileInfo.h"
92 #include "third_party/WebKit/public/platform/WebGamepads.h" 93 #include "third_party/WebKit/public/platform/WebGamepads.h"
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 if (accessor) 738 if (accessor)
738 return accessor; 739 return accessor;
739 740
740 return new RendererWebMIDIAccessorImpl(client); 741 return new RendererWebMIDIAccessorImpl(client);
741 } 742 }
742 743
743 void RendererBlinkPlatformImpl::getPluginList( 744 void RendererBlinkPlatformImpl::getPluginList(
744 bool refresh, 745 bool refresh,
745 const blink::WebSecurityOrigin& mainFrameOrigin, 746 const blink::WebSecurityOrigin& mainFrameOrigin,
746 blink::WebPluginListBuilder* builder) { 747 blink::WebPluginListBuilder* builder) {
747 #if defined(ENABLE_PLUGINS) 748 #if BUILDFLAG(ENABLE_PLUGINS)
748 std::vector<WebPluginInfo> plugins; 749 std::vector<WebPluginInfo> plugins;
749 if (!plugin_refresh_allowed_) 750 if (!plugin_refresh_allowed_)
750 refresh = false; 751 refresh = false;
751 RenderThread::Get()->Send( 752 RenderThread::Get()->Send(
752 new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins)); 753 new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins));
753 for (const WebPluginInfo& plugin : plugins) { 754 for (const WebPluginInfo& plugin : plugins) {
754 builder->addPlugin( 755 builder->addPlugin(
755 plugin.name, plugin.desc, 756 plugin.name, plugin.desc,
756 plugin.path.BaseName().AsUTF16Unsafe()); 757 plugin.path.BaseName().AsUTF16Unsafe());
757 758
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 return &trial_token_validator_; 1291 return &trial_token_validator_;
1291 } 1292 }
1292 1293
1293 void RendererBlinkPlatformImpl::workerContextCreated( 1294 void RendererBlinkPlatformImpl::workerContextCreated(
1294 const v8::Local<v8::Context>& worker) { 1295 const v8::Local<v8::Context>& worker) {
1295 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( 1296 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
1296 worker); 1297 worker);
1297 } 1298 }
1298 1299
1299 } // namespace content 1300 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698