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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 | 72 |
73 delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP); | 73 delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP); |
74 return TRUE; | 74 return TRUE; |
75 } | 75 } |
76 | 76 |
77 } // namespace | 77 } // namespace |
78 | 78 |
79 namespace content { | 79 namespace content { |
80 | 80 |
| 81 WebContentsView* CreateWebContentsView(WebContentsImpl* web_contents, |
| 82 WebContentsViewDelegate* delegate) { |
| 83 return new WebContentsViewGtk(web_contents, delegate); |
| 84 } |
| 85 |
81 WebContentsViewGtk::WebContentsViewGtk( | 86 WebContentsViewGtk::WebContentsViewGtk( |
82 WebContentsImpl* web_contents, | 87 WebContentsImpl* web_contents, |
83 content::WebContentsViewDelegate* delegate) | 88 content::WebContentsViewDelegate* delegate) |
84 : web_contents_(web_contents), | 89 : web_contents_(web_contents), |
85 expanded_(gtk_expanded_container_new()), | 90 expanded_(gtk_expanded_container_new()), |
86 delegate_(delegate) { | 91 delegate_(delegate) { |
87 gtk_widget_set_name(expanded_.get(), "chrome-web-contents-view"); | 92 gtk_widget_set_name(expanded_.get(), "chrome-web-contents-view"); |
88 g_signal_connect(expanded_.get(), "size-allocate", | 93 g_signal_connect(expanded_.get(), "size-allocate", |
89 G_CALLBACK(OnSizeAllocateThunk), this); | 94 G_CALLBACK(OnSizeAllocateThunk), this); |
90 g_signal_connect(expanded_.get(), "child-size-request", | 95 g_signal_connect(expanded_.get(), "child-size-request", |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 // We manually tell our RWHV to resize the renderer content. This avoids | 430 // We manually tell our RWHV to resize the renderer content. This avoids |
426 // spurious resizes from GTK+. | 431 // spurious resizes from GTK+. |
427 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); | 432 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); |
428 if (rwhv) | 433 if (rwhv) |
429 rwhv->SetSize(size); | 434 rwhv->SetSize(size); |
430 if (web_contents_->GetInterstitialPage()) | 435 if (web_contents_->GetInterstitialPage()) |
431 web_contents_->GetInterstitialPage()->SetSize(size); | 436 web_contents_->GetInterstitialPage()->SetSize(size); |
432 } | 437 } |
433 | 438 |
434 } // namespace content | 439 } // namespace content |
OLD | NEW |