Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5556)

Unified Diff: chrome/browser/cocoa/find_bar_cocoa_controller.mm

Issue 1061003: [Mac] Makes ctrl-return follow links when finding in page.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/find_bar_cocoa_controller.h ('k') | chrome/browser/find_bar_host_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/find_bar_cocoa_controller.mm
===================================================================
--- chrome/browser/cocoa/find_bar_cocoa_controller.mm (revision 42265)
+++ chrome/browser/cocoa/find_bar_cocoa_controller.mm (working copy)
@@ -147,6 +147,7 @@
textView:(NSTextView*)textView
doCommandBySelector:(SEL)command {
if (command == @selector(insertNewline:)) {
+ // Pressing Return
NSEvent* event = [NSApp currentEvent];
if ([event modifierFlags] & NSShiftKeyMask)
@@ -155,6 +156,13 @@
[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 @@
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
« no previous file with comments | « chrome/browser/cocoa/find_bar_cocoa_controller.h ('k') | chrome/browser/find_bar_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698