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

Unified Diff: chrome/browser/ui/gtk/panels/panel_gtk.cc

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/browser/ui/gtk/panels/panel_gtk.cc
diff --git a/chrome/browser/ui/gtk/panels/panel_gtk.cc b/chrome/browser/ui/gtk/panels/panel_gtk.cc
index 5423a77f66214dd62e8ac56da5f6351f2f4a51c5..3b9357695c2a7af1bfa528e4cfddce772de50762 100644
--- a/chrome/browser/ui/gtk/panels/panel_gtk.cc
+++ b/chrome/browser/ui/gtk/panels/panel_gtk.cc
@@ -29,6 +29,7 @@
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
#include "ui/base/accelerators/platform_accelerator_gtk.h"
@@ -941,7 +942,7 @@ void PanelGtk::PanelExpansionStateChanging(
void PanelGtk::AttachWebContents(content::WebContents* contents) {
if (!contents)
return;
- gfx::NativeView widget = contents->GetNativeView();
+ gfx::NativeView widget = contents->GetView()->GetNativeView();
if (widget) {
gtk_container_add(GTK_CONTAINER(contents_expanded_), widget);
gtk_widget_show(widget);
@@ -950,7 +951,7 @@ void PanelGtk::AttachWebContents(content::WebContents* contents) {
}
void PanelGtk::DetachWebContents(content::WebContents* contents) {
- gfx::NativeView widget = contents->GetNativeView();
+ gfx::NativeView widget = contents->GetView()->GetNativeView();
if (widget) {
GtkWidget* parent = gtk_widget_get_parent(widget);
if (parent) {
« no previous file with comments | « chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc ('k') | chrome/browser/ui/gtk/password_generation_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698