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

Unified Diff: content/renderer/npapi/webplugin_impl.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/npapi/webplugin_delegate_proxy.cc ('k') | content/renderer/pepper/ppb_image_data_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/npapi/webplugin_impl.cc
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index f9caddc4d3fccb1d5d57f7c8e892eba696a1ef0a..892309bdf653392c07e6ee0140192c45bd130dee 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -578,13 +578,6 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
#else
accepts_input_events_ = false;
-#if defined(USE_X11)
- // Tell the view delegate that the plugin window was created, so that it
- // can create necessary container widgets.
- render_frame_->Send(new ViewHostMsg_CreatePluginContainer(
- render_frame_->GetRenderWidget()->routing_id(), window));
-#endif // USE_X11
-
#endif // OS_MACOSX
} else {
DCHECK(!window_); // Make sure not called twice.
@@ -600,13 +593,8 @@ void WebPluginImpl::SetAcceptsInputEvents(bool accepts) {
void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) {
DCHECK_EQ(window, window_);
window_ = gfx::kNullPluginWindow;
- if (render_view_.get()) {
-#if defined(USE_X11)
- render_frame_->Send(new ViewHostMsg_DestroyPluginContainer(
- render_frame_->GetRenderWidget()->routing_id(), window));
-#endif
+ if (render_view_.get())
render_frame_->GetRenderWidget()->CleanupWindowInPluginMoves(window);
- }
}
GURL WebPluginImpl::CompleteURL(const char* url) {
« no previous file with comments | « content/renderer/npapi/webplugin_delegate_proxy.cc ('k') | content/renderer/pepper/ppb_image_data_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698