| 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 | 219 |
| 220 DropData* WebContentsViewMac::GetDropData() const { | 220 DropData* WebContentsViewMac::GetDropData() const { |
| 221 return [cocoa_view_ dropData]; | 221 return [cocoa_view_ dropData]; |
| 222 } | 222 } |
| 223 | 223 |
| 224 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) { | 224 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) { |
| 225 [cocoa_view_ setCurrentDragOperation: operation]; | 225 [cocoa_view_ setCurrentDragOperation: operation]; |
| 226 } | 226 } |
| 227 | 227 |
| 228 void WebContentsViewMac::GotFocus() { | 228 void WebContentsViewMac::GotFocus() { |
| 229 // This is only used in the views FocusManager stuff but it bleeds through | 229 web_contents_->NotifyWebContentsFocused(); |
| 230 // all subclasses. http://crbug.com/21875 | |
| 231 } | 230 } |
| 232 | 231 |
| 233 // This is called when the renderer asks us to take focus back (i.e., it has | 232 // This is called when the renderer asks us to take focus back (i.e., it has |
| 234 // iterated past the last focusable element on the page). | 233 // iterated past the last focusable element on the page). |
| 235 void WebContentsViewMac::TakeFocus(bool reverse) { | 234 void WebContentsViewMac::TakeFocus(bool reverse) { |
| 236 if (reverse) { | 235 if (reverse) { |
| 237 [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()]; | 236 [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()]; |
| 238 } else { | 237 } else { |
| 239 [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()]; | 238 [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()]; |
| 240 } | 239 } |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 | 678 |
| 680 - (void)viewDidHide { | 679 - (void)viewDidHide { |
| 681 [self updateWebContentsVisibility]; | 680 [self updateWebContentsVisibility]; |
| 682 } | 681 } |
| 683 | 682 |
| 684 - (void)viewDidUnhide { | 683 - (void)viewDidUnhide { |
| 685 [self updateWebContentsVisibility]; | 684 [self updateWebContentsVisibility]; |
| 686 } | 685 } |
| 687 | 686 |
| 688 @end | 687 @end |
| OLD | NEW |