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

Side by Side Diff: content/renderer/render_view_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_thread_impl.cc ('k') | content/renderer/render_widget.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/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #include "content/renderer/websharedworker_proxy.h" 99 #include "content/renderer/websharedworker_proxy.h"
100 #include "media/audio/audio_output_device.h" 100 #include "media/audio/audio_output_device.h"
101 #include "media/base/media_switches.h" 101 #include "media/base/media_switches.h"
102 #include "media/renderers/audio_renderer_impl.h" 102 #include "media/renderers/audio_renderer_impl.h"
103 #include "media/renderers/gpu_video_accelerator_factories.h" 103 #include "media/renderers/gpu_video_accelerator_factories.h"
104 #include "net/base/data_url.h" 104 #include "net/base/data_url.h"
105 #include "net/base/escape.h" 105 #include "net/base/escape.h"
106 #include "net/base/net_errors.h" 106 #include "net/base/net_errors.h"
107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
108 #include "net/http/http_util.h" 108 #include "net/http/http_util.h"
109 #include "ppapi/features/features.h"
109 #include "skia/ext/platform_canvas.h" 110 #include "skia/ext/platform_canvas.h"
110 #include "third_party/WebKit/public/platform/FilePathConversion.h" 111 #include "third_party/WebKit/public/platform/FilePathConversion.h"
111 #include "third_party/WebKit/public/platform/URLConversion.h" 112 #include "third_party/WebKit/public/platform/URLConversion.h"
112 #include "third_party/WebKit/public/platform/WebConnectionType.h" 113 #include "third_party/WebKit/public/platform/WebConnectionType.h"
113 #include "third_party/WebKit/public/platform/WebHTTPBody.h" 114 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
114 #include "third_party/WebKit/public/platform/WebImage.h" 115 #include "third_party/WebKit/public/platform/WebImage.h"
115 #include "third_party/WebKit/public/platform/WebInputEvent.h" 116 #include "third_party/WebKit/public/platform/WebInputEvent.h"
116 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" 117 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
117 #include "third_party/WebKit/public/platform/WebPoint.h" 118 #include "third_party/WebKit/public/platform/WebPoint.h"
118 #include "third_party/WebKit/public/platform/WebRect.h" 119 #include "third_party/WebKit/public/platform/WebRect.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 #include "content/renderer/android/content_detector.h" 181 #include "content/renderer/android/content_detector.h"
181 #include "content/renderer/android/disambiguation_popup_helper.h" 182 #include "content/renderer/android/disambiguation_popup_helper.h"
182 #include "content/renderer/android/email_detector.h" 183 #include "content/renderer/android/email_detector.h"
183 #include "content/renderer/android/phone_number_detector.h" 184 #include "content/renderer/android/phone_number_detector.h"
184 #include "ui/gfx/geometry/rect_f.h" 185 #include "ui/gfx/geometry/rect_f.h"
185 186
186 #elif defined(OS_MACOSX) 187 #elif defined(OS_MACOSX)
187 #include "skia/ext/skia_utils_mac.h" 188 #include "skia/ext/skia_utils_mac.h"
188 #endif 189 #endif
189 190
190 #if defined(ENABLE_PLUGINS) 191 #if BUILDFLAG(ENABLE_PLUGINS)
191 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 192 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
192 #include "content/renderer/pepper/pepper_plugin_registry.h" 193 #include "content/renderer/pepper/pepper_plugin_registry.h"
193 #endif 194 #endif
194 195
195 #if defined(ENABLE_WEBRTC) 196 #if defined(ENABLE_WEBRTC)
196 #include "content/renderer/media/rtc_peer_connection_handler.h" 197 #include "content/renderer/media/rtc_peer_connection_handler.h"
197 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 198 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
198 #endif 199 #endif
199 200
200 using blink::WebAXObject; 201 using blink::WebAXObject;
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 1096
1096 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { 1097 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
1097 observer->RenderViewGone(); 1098 observer->RenderViewGone();
1098 observers_.RemoveObserver(observer); 1099 observers_.RemoveObserver(observer);
1099 } 1100 }
1100 1101
1101 blink::WebView* RenderViewImpl::webview() const { 1102 blink::WebView* RenderViewImpl::webview() const {
1102 return webview_; 1103 return webview_;
1103 } 1104 }
1104 1105
1105 #if defined(ENABLE_PLUGINS) 1106 #if BUILDFLAG(ENABLE_PLUGINS)
1106 1107
1107 #if defined(OS_MACOSX) 1108 #if defined(OS_MACOSX)
1108 void RenderViewImpl::OnGetRenderedText() { 1109 void RenderViewImpl::OnGetRenderedText() {
1109 if (!webview()) 1110 if (!webview())
1110 return; 1111 return;
1111 1112
1112 if (!webview()->mainFrame()->isWebLocalFrame()) 1113 if (!webview()->mainFrame()->isWebLocalFrame())
1113 return; 1114 return;
1114 1115
1115 // Get rendered text from WebLocalFrame. 1116 // Get rendered text from WebLocalFrame.
(...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2782 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2782 } 2783 }
2783 2784
2784 std::unique_ptr<InputEventAck> ack( 2785 std::unique_ptr<InputEventAck> ack(
2785 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, 2786 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
2786 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2787 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2787 OnInputEventAck(std::move(ack)); 2788 OnInputEventAck(std::move(ack));
2788 } 2789 }
2789 2790
2790 } // namespace content 2791 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698