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

Side by Side Diff: webkit/plugins/npapi/gtk_plugin_container_manager.cc

Issue 8897006: GTK: Remove deprecated methods and replace them with the new standard calls. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Oh, that's what the conflict was. Remove double gtk/gtk.h Created 9 years 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 | « ui/gfx/gtk_preserve_window.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/gtk_plugin_container_manager.h" 5 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/gtk/gtk_compat.h" 10 #include "ui/base/gtk/gtk_compat.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 plugin_window_to_widget_map_.erase(id); 59 plugin_window_to_widget_map_.erase(id);
60 } 60 }
61 61
62 void GtkPluginContainerManager::MovePluginContainer( 62 void GtkPluginContainerManager::MovePluginContainer(
63 const WebPluginGeometry& move) { 63 const WebPluginGeometry& move) {
64 DCHECK(host_widget_); 64 DCHECK(host_widget_);
65 GtkWidget *widget = MapIDToWidget(move.window); 65 GtkWidget *widget = MapIDToWidget(move.window);
66 if (!widget) 66 if (!widget)
67 return; 67 return;
68 68
69 DCHECK(!GTK_WIDGET_NO_WINDOW(widget)); 69 DCHECK(gtk_widget_get_has_window(widget));
70 70
71 if (!move.visible) { 71 if (!move.visible) {
72 gtk_widget_hide(widget); 72 gtk_widget_hide(widget);
73 return; 73 return;
74 } 74 }
75 75
76 gtk_widget_show(widget); 76 gtk_widget_show(widget);
77 77
78 if (!move.rects_valid) 78 if (!move.rects_valid)
79 return; 79 return;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 GtkPluginContainerManager* plugin_container_manager = 153 GtkPluginContainerManager* plugin_container_manager =
154 static_cast<GtkPluginContainerManager*>(user_data); 154 static_cast<GtkPluginContainerManager*>(user_data);
155 155
156 gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget); 156 gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget);
157 if (id) 157 if (id)
158 gtk_socket_add_id(GTK_SOCKET(widget), id); 158 gtk_socket_add_id(GTK_SOCKET(widget), id);
159 } 159 }
160 160
161 } // namespace npapi 161 } // namespace npapi
162 } // namespace webkit 162 } // namespace webkit
OLDNEW
« no previous file with comments | « ui/gfx/gtk_preserve_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698