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

Unified Diff: content/renderer/render_view_impl.h

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Jay's comments and rebase Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index ec3dcb4e5375dbd63ca85d36d0956a70a4042b9e..0ad55d65c40874ecb6691ef63b074f53f55e0e2a 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -28,7 +28,8 @@
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/stop_find_action.h"
#include "content/public/renderer/render_view.h"
-#include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
+#include "content/renderer/mouse_lock_dispatcher.h"
+#include "content/renderer/plugin_delegate_helper.h"
#include "content/renderer/render_widget.h"
#include "content/renderer/renderer_webcookiejar_impl.h"
#include "ipc/ipc_platform_file.h"
@@ -80,7 +81,6 @@ namespace webkit {
namespace ppapi {
class PluginInstance;
-class WebPluginImpl;
} // namespace ppapi
} // namespace webkit
@@ -1530,15 +1530,15 @@ class CONTENT_EXPORT RenderViewImpl
// view, if this is a swapped out render view.
std::map<int, int> active_frame_id_map_;
- // NOTE: pepper_delegate_ should be last member because its constructor calls
- // AddObservers method of RenderViewImpl from c-tor.
- PepperPluginDelegateImpl pepper_delegate_;
-
// This field stores drag/drop related info for the event that is currently
// being handled. If the current event results in starting a drag/drop
// session, this info is sent to the browser along with other drag/drop info.
DragEventSourceInfo possible_drag_event_info_;
+ // NOTE: pepper_delegate_ should be last member because its constructor calls
+ // AddObservers method of RenderViewImpl from c-tor.
+ scoped_ptr<PluginDelegateHelper> pepper_delegate_;
+
// ---------------------------------------------------------------------------
// ADDING NEW DATA? Please see if it fits appropriately in one of the above
// sections rather than throwing it randomly at the end. If you're adding a

Powered by Google App Engine
This is Rietveld 408576698