| OLD | NEW |
| 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 #include "content/browser/web_contents/web_contents_view_gtk.h" | 5 #include "content/browser/web_contents/web_contents_view_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
| 9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 | 10 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } // namespace | 77 } // namespace |
| 78 | 78 |
| 79 namespace content { | 79 namespace content { |
| 80 | 80 |
| 81 WebContentsViewGtk::WebContentsViewGtk( | 81 WebContentsViewGtk::WebContentsViewGtk( |
| 82 WebContentsImpl* web_contents, | 82 WebContentsImpl* web_contents, |
| 83 content::WebContentsViewDelegate* delegate) | 83 content::WebContentsViewDelegate* delegate) |
| 84 : web_contents_(web_contents), | 84 : web_contents_(web_contents), |
| 85 expanded_(gtk_expanded_container_new()), | 85 expanded_(gtk_expanded_container_new()), |
| 86 delegate_(delegate) { | 86 delegate_(delegate) { |
| 87 gtk_widget_set_name(expanded_.get(), "chrome-tab-contents-view"); | 87 gtk_widget_set_name(expanded_.get(), "chrome-web-contents-view"); |
| 88 g_signal_connect(expanded_.get(), "size-allocate", | 88 g_signal_connect(expanded_.get(), "size-allocate", |
| 89 G_CALLBACK(OnSizeAllocateThunk), this); | 89 G_CALLBACK(OnSizeAllocateThunk), this); |
| 90 g_signal_connect(expanded_.get(), "child-size-request", | 90 g_signal_connect(expanded_.get(), "child-size-request", |
| 91 G_CALLBACK(OnChildSizeRequestThunk), this); | 91 G_CALLBACK(OnChildSizeRequestThunk), this); |
| 92 | 92 |
| 93 gtk_widget_show(expanded_.get()); | 93 gtk_widget_show(expanded_.get()); |
| 94 drag_source_.reset(new content::WebDragSourceGtk(web_contents)); | 94 drag_source_.reset(new content::WebDragSourceGtk(web_contents)); |
| 95 | 95 |
| 96 if (delegate_.get()) | 96 if (delegate_.get()) |
| 97 delegate_->Initialize(expanded_.get(), &focus_store_); | 97 delegate_->Initialize(expanded_.get(), &focus_store_); |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 // We manually tell our RWHV to resize the renderer content. This avoids | 421 // We manually tell our RWHV to resize the renderer content. This avoids |
| 422 // spurious resizes from GTK+. | 422 // spurious resizes from GTK+. |
| 423 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); | 423 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); |
| 424 if (rwhv) | 424 if (rwhv) |
| 425 rwhv->SetSize(size); | 425 rwhv->SetSize(size); |
| 426 if (web_contents_->GetInterstitialPage()) | 426 if (web_contents_->GetInterstitialPage()) |
| 427 web_contents_->GetInterstitialPage()->SetSize(size); | 427 web_contents_->GetInterstitialPage()->SetSize(size); |
| 428 } | 428 } |
| 429 | 429 |
| 430 } // namespace content | 430 } // namespace content |
| OLD | NEW |