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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 1825253002: Revert of Remove a bunch of NPAPI quirks and related support code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_windowed_plugins
Patch Set: Created 4 years, 9 months 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/npapi/webplugin_impl.h ('k') | content/renderer/render_view_impl.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 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 PepperPluginInstanceImpl* focused_pepper_plugin() { 251 PepperPluginInstanceImpl* focused_pepper_plugin() {
252 return focused_pepper_plugin_; 252 return focused_pepper_plugin_;
253 } 253 }
254 PepperPluginInstanceImpl* pepper_last_mouse_event_target() { 254 PepperPluginInstanceImpl* pepper_last_mouse_event_target() {
255 return pepper_last_mouse_event_target_; 255 return pepper_last_mouse_event_target_;
256 } 256 }
257 void set_pepper_last_mouse_event_target(PepperPluginInstanceImpl* plugin) { 257 void set_pepper_last_mouse_event_target(PepperPluginInstanceImpl* plugin) {
258 pepper_last_mouse_event_target_ = plugin; 258 pepper_last_mouse_event_target_ = plugin;
259 } 259 }
260 260
261 #if defined(OS_MACOSX) 261 #if defined(OS_MACOSX) || defined(OS_WIN)
262 // Informs the render view that the given plugin has gained or lost focus. 262 // Informs the render view that the given plugin has gained or lost focus.
263 void PluginFocusChanged(bool focused, int plugin_id); 263 void PluginFocusChanged(bool focused, int plugin_id);
264 #endif
264 265
266 #if defined(OS_MACOSX)
265 // Starts plugin IME. 267 // Starts plugin IME.
266 void StartPluginIme(); 268 void StartPluginIme();
267 #endif 269 #endif
268 270
269 // Indicates that the given instance has been created. 271 // Indicates that the given instance has been created.
270 void PepperInstanceCreated(PepperPluginInstanceImpl* instance); 272 void PepperInstanceCreated(PepperPluginInstanceImpl* instance);
271 273
272 // Indicates that the given instance is being destroyed. This is called from 274 // Indicates that the given instance is being destroyed. This is called from
273 // the destructor, so it's important that the instance is not dereferenced 275 // the destructor, so it's important that the instance is not dereferenced
274 // from this call. 276 // from this call.
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 scoped_ptr<RendererDateTimePicker> date_time_picker_client_; 935 scoped_ptr<RendererDateTimePicker> date_time_picker_client_;
934 #endif 936 #endif
935 937
936 // Plugins ------------------------------------------------------------------- 938 // Plugins -------------------------------------------------------------------
937 939
938 // All the currently active plugin delegates for this RenderView; kept so 940 // All the currently active plugin delegates for this RenderView; kept so
939 // that we can enumerate them to send updates about things like window 941 // that we can enumerate them to send updates about things like window
940 // location or tab focus and visibily. These are non-owning references. 942 // location or tab focus and visibily. These are non-owning references.
941 std::set<WebPluginDelegateProxy*> plugin_delegates_; 943 std::set<WebPluginDelegateProxy*> plugin_delegates_;
942 944
945 #if defined(OS_WIN)
946 // The ID of the focused NPAPI plugin.
947 int focused_plugin_id_;
948 #endif
949
943 #if defined(ENABLE_PLUGINS) 950 #if defined(ENABLE_PLUGINS)
944 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet; 951 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
945 PepperPluginSet active_pepper_instances_; 952 PepperPluginSet active_pepper_instances_;
946 953
947 // TODO(jam): these belong on RenderFrame, once the browser knows which frame 954 // TODO(jam): these belong on RenderFrame, once the browser knows which frame
948 // is focused and sends the IPCs which use these to the correct frame. Until 955 // is focused and sends the IPCs which use these to the correct frame. Until
949 // then, we must store these on RenderView as that's the one place that knows 956 // then, we must store these on RenderView as that's the one place that knows
950 // about all the RenderFrames for a page. 957 // about all the RenderFrames for a page.
951 958
952 // Whether or not the focus is on a PPAPI plugin 959 // Whether or not the focus is on a PPAPI plugin
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 // use the Observer interface to filter IPC messages and receive frame change 1015 // use the Observer interface to filter IPC messages and receive frame change
1009 // notifications. 1016 // notifications.
1010 // --------------------------------------------------------------------------- 1017 // ---------------------------------------------------------------------------
1011 1018
1012 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1019 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1013 }; 1020 };
1014 1021
1015 } // namespace content 1022 } // namespace content
1016 1023
1017 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1024 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/npapi/webplugin_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698