summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/find_bar_cocoa_controller.mm
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 22:54:03 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 22:54:03 +0000
commit2e39f625a1e09e2a1b29bb90e3a4aa1fee5829b1 (patch)
tree01c5246ff1483905cb1667a28ac116fe4559ab4b /chrome/browser/cocoa/find_bar_cocoa_controller.mm
parent7403d38f1a07efda20d3e6408a2edaf371da0007 (diff)
downloadchromium_src-2e39f625a1e09e2a1b29bb90e3a4aa1fee5829b1.zip
chromium_src-2e39f625a1e09e2a1b29bb90e3a4aa1fee5829b1.tar.gz
chromium_src-2e39f625a1e09e2a1b29bb90e3a4aa1fee5829b1.tar.bz2
[Mac] Makes ctrl-return follow links when finding in page.
Enables the FindInPageControllerTest browser test on Mac. BUG=38365,37808 TEST=Do a find in page for text in a link. Pressing ctrl-return while the findbar has focus should follow the link. Review URL: http://codereview.chromium.org/1061003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/find_bar_cocoa_controller.mm')
-rw-r--r--chrome/browser/cocoa/find_bar_cocoa_controller.mm12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
index 569455f..a0eb5f3 100644
--- a/chrome/browser/cocoa/find_bar_cocoa_controller.mm
+++ b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
@@ -147,6 +147,7 @@ const float kFindBarCloseDuration = 0.15;
textView:(NSTextView*)textView
doCommandBySelector:(SEL)command {
if (command == @selector(insertNewline:)) {
+ // Pressing Return
NSEvent* event = [NSApp currentEvent];
if ([event modifierFlags] & NSShiftKeyMask)
@@ -155,6 +156,13 @@ const float kFindBarCloseDuration = 0.15;
[nextButton_ performClick:nil];
return YES;
+ } else if (command == @selector(insertLineBreak:)) {
+ // Pressing Ctrl-Return
+ if (findBarBridge_) {
+ findBarBridge_->GetFindBarController()->EndFindSession(
+ FindBarController::kActivateSelection);
+ }
+ return YES;
} else if (command == @selector(pageUp:) ||
command == @selector(pageUpAndModifySelection:) ||
command == @selector(scrollPageUp:) ||
@@ -291,6 +299,10 @@ const float kFindBarCloseDuration = 0.15;
return NSIntersectsRect([[self view] bounds], [findBarView_ frame]);
}
+- (BOOL)isFindBarAnimating {
+ return (currentAnimation_.get() != nil);
+}
+
// NSAnimation delegate methods.
- (void)animationDidEnd:(NSAnimation*)animation {
// Autorelease the animation (cannot use release because the animation object