OLD | NEW |
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 "chrome/browser/tab_contents/tab_contents_view_gtk.h" | 5 #include "chrome/browser/tab_contents/tab_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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 return FALSE; | 320 return FALSE; |
321 | 321 |
322 gtk_widget_grab_focus(widget); | 322 gtk_widget_grab_focus(widget); |
323 bool reverse = focus == GTK_DIR_TAB_BACKWARD; | 323 bool reverse = focus == GTK_DIR_TAB_BACKWARD; |
324 tab_contents_->FocusThroughTabTraversal(reverse); | 324 tab_contents_->FocusThroughTabTraversal(reverse); |
325 return TRUE; | 325 return TRUE; |
326 } | 326 } |
327 | 327 |
328 void TabContentsViewGtk::CreateNewWindow( | 328 void TabContentsViewGtk::CreateNewWindow( |
329 int route_id, | 329 int route_id, |
330 const ViewHostMsg_CreateWindow_Params& params) { | 330 const ViewHostMsg_CreateWindow_Params& params, |
331 delegate_view_helper_.CreateNewWindowFromTabContents( | 331 content::ContentFrame* opener) { |
332 tab_contents_, route_id, params); | 332 delegate_view_helper_.CreateNewWindowFromContentFrame( |
| 333 opener, route_id, params); |
333 } | 334 } |
334 | 335 |
335 void TabContentsViewGtk::CreateNewWidget( | 336 void TabContentsViewGtk::CreateNewWidget( |
336 int route_id, WebKit::WebPopupType popup_type) { | 337 int route_id, WebKit::WebPopupType popup_type) { |
337 delegate_view_helper_.CreateNewWidget(route_id, popup_type, | 338 delegate_view_helper_.CreateNewWidget(route_id, popup_type, |
338 tab_contents_->render_view_host()->process()); | 339 tab_contents_->render_view_host()->process()); |
339 } | 340 } |
340 | 341 |
341 void TabContentsViewGtk::CreateNewFullscreenWidget(int route_id) { | 342 void TabContentsViewGtk::CreateNewFullscreenWidget(int route_id) { |
342 delegate_view_helper_.CreateNewFullscreenWidget( | 343 delegate_view_helper_.CreateNewFullscreenWidget( |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 requested_size_ = size; | 419 requested_size_ = size; |
419 | 420 |
420 // 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 |
421 // spurious resizes from GTK+. | 422 // spurious resizes from GTK+. |
422 RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView(); | 423 RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView(); |
423 if (rwhv) | 424 if (rwhv) |
424 rwhv->SetSize(size); | 425 rwhv->SetSize(size); |
425 if (tab_contents_->interstitial_page()) | 426 if (tab_contents_->interstitial_page()) |
426 tab_contents_->interstitial_page()->SetSize(size); | 427 tab_contents_->interstitial_page()->SetSize(size); |
427 } | 428 } |
OLD | NEW |