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 #import <Carbon/Carbon.h> | 5 #import <Carbon/Carbon.h> |
6 | 6 |
7 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" | 7 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 void TabContentsViewMac::TakeFocus(bool reverse) { | 264 void TabContentsViewMac::TakeFocus(bool reverse) { |
265 if (reverse) { | 265 if (reverse) { |
266 [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()]; | 266 [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()]; |
267 } else { | 267 } else { |
268 [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()]; | 268 [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()]; |
269 } | 269 } |
270 } | 270 } |
271 | 271 |
272 void TabContentsViewMac::CreateNewWindow( | 272 void TabContentsViewMac::CreateNewWindow( |
273 int route_id, | 273 int route_id, |
274 const ViewHostMsg_CreateWindow_Params& params) { | 274 const ViewHostMsg_CreateWindow_Params& params, |
| 275 ContentFrame* opener) { |
275 delegate_view_helper_.CreateNewWindowFromTabContents( | 276 delegate_view_helper_.CreateNewWindowFromTabContents( |
276 tab_contents_, route_id, params); | 277 opener, route_id, params); |
277 } | 278 } |
278 | 279 |
279 void TabContentsViewMac::CreateNewWidget( | 280 void TabContentsViewMac::CreateNewWidget( |
280 int route_id, WebKit::WebPopupType popup_type) { | 281 int route_id, WebKit::WebPopupType popup_type) { |
281 RenderWidgetHostView* widget_view = delegate_view_helper_.CreateNewWidget( | 282 RenderWidgetHostView* widget_view = delegate_view_helper_.CreateNewWidget( |
282 route_id, popup_type, tab_contents_->render_view_host()->process()); | 283 route_id, popup_type, tab_contents_->render_view_host()->process()); |
283 | 284 |
284 // A RenderWidgetHostViewMac has lifetime scoped to the view. We'll retain it | 285 // A RenderWidgetHostViewMac has lifetime scoped to the view. We'll retain it |
285 // to allow it to survive the trip without being hosted. | 286 // to allow it to survive the trip without being hosted. |
286 RenderWidgetHostViewMac* widget_view_mac = | 287 RenderWidgetHostViewMac* widget_view_mac = |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 [[[notification userInfo] objectForKey:kSelectionDirection] | 603 [[[notification userInfo] objectForKey:kSelectionDirection] |
603 unsignedIntegerValue]; | 604 unsignedIntegerValue]; |
604 if (direction == NSDirectSelection) | 605 if (direction == NSDirectSelection) |
605 return; | 606 return; |
606 | 607 |
607 [self tabContents]-> | 608 [self tabContents]-> |
608 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 609 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
609 } | 610 } |
610 | 611 |
611 @end | 612 @end |
OLD | NEW |