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 #import <Carbon/Carbon.h> | 5 #import <Carbon/Carbon.h> |
6 | 6 |
7 #import "content/browser/web_contents/web_contents_view_mac.h" | 7 #import "content/browser/web_contents/web_contents_view_mac.h" |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 if (allow_overlapping_views_ == overlapping) | 266 if (allow_overlapping_views_ == overlapping) |
267 return; | 267 return; |
268 | 268 |
269 allow_overlapping_views_ = overlapping; | 269 allow_overlapping_views_ = overlapping; |
270 RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>( | 270 RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>( |
271 web_contents_->GetRenderWidgetHostView()); | 271 web_contents_->GetRenderWidgetHostView()); |
272 if (view) | 272 if (view) |
273 view->SetAllowOverlappingViews(allow_overlapping_views_); | 273 view->SetAllowOverlappingViews(allow_overlapping_views_); |
274 } | 274 } |
275 | 275 |
| 276 bool WebContentsViewMac::GetAllowOverlappingViews() const { |
| 277 return allow_overlapping_views_; |
| 278 } |
| 279 |
276 void WebContentsViewMac::CreateView( | 280 void WebContentsViewMac::CreateView( |
277 const gfx::Size& initial_size, gfx::NativeView context) { | 281 const gfx::Size& initial_size, gfx::NativeView context) { |
278 WebContentsViewCocoa* view = | 282 WebContentsViewCocoa* view = |
279 [[WebContentsViewCocoa alloc] initWithWebContentsViewMac:this]; | 283 [[WebContentsViewCocoa alloc] initWithWebContentsViewMac:this]; |
280 cocoa_view_.reset(view); | 284 cocoa_view_.reset(view); |
281 } | 285 } |
282 | 286 |
283 RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget( | 287 RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget( |
284 RenderWidgetHost* render_widget_host) { | 288 RenderWidgetHost* render_widget_host) { |
285 if (render_widget_host->GetView()) { | 289 if (render_widget_host->GetView()) { |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 [[[notification userInfo] objectForKey:kSelectionDirection] | 567 [[[notification userInfo] objectForKey:kSelectionDirection] |
564 unsignedIntegerValue]; | 568 unsignedIntegerValue]; |
565 if (direction == NSDirectSelection) | 569 if (direction == NSDirectSelection) |
566 return; | 570 return; |
567 | 571 |
568 [self webContents]-> | 572 [self webContents]-> |
569 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 573 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
570 } | 574 } |
571 | 575 |
572 @end | 576 @end |
OLD | NEW |