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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

Issue 176022: [Mac] Handle shift-delete when omnibox popup is up. (Closed)
Patch Set: Bind to shift-deleteForward. Created 11 years, 4 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/autocomplete/autocomplete_edit_view_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 69a1b4ee32dd4578503bcc95eef4d7763fa2c325..f49963a13ffcd07ff2b36966419f9139bfc66114 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -653,6 +653,10 @@ bool AutocompleteEditViewMac::IsPopupOpen() const {
return popup_view_->IsOpen();
}
+void AutocompleteEditViewMac::TryDeletingCurrentItem() {
+ popup_view_->GetModel()->TryDeletingCurrentItem();
+}
+
void AutocompleteEditViewMac::OnControlKeyChanged(bool pressed) {
model_->OnControlKeyChanged(pressed);
}
@@ -782,6 +786,16 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
}
}
+ if (cmd == @selector(deleteForward:)) {
+ const NSUInteger modifiers = [[NSApp currentEvent] modifierFlags];
+ if ((modifiers & NSShiftKeyMask) != 0) {
+ if (edit_view_->IsPopupOpen()) {
+ edit_view_->TryDeletingCurrentItem();
+ return YES;
+ }
+ }
+ }
+
// Capture the state before the operation changes the content.
// TODO(shess): Determine if this is always redundent WRT the call
// in -controlTextDidChange:.
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698