Properly collapse newlines (and leading/trailing whitespace) from pasted...

chrome/browser/cocoa/autocomplete_text_field_editor.mm

Index: chrome/browser/cocoa/autocomplete_text_field_editor.mm
===================================================================
--- chrome/browser/cocoa/autocomplete_text_field_editor.mm	(revision 21067)
+++ chrome/browser/cocoa/autocomplete_text_field_editor.mm	(working copy)
@@ -7,18 +7,23 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 
+using base::SysNSStringToWide;
+using base::SysWideToNSString;
+
 @implementation AutocompleteTextFieldEditor
 
 - (void)copy:(id)sender {
-  NSPasteboard* pb = [NSPasteboard generalPasteboard];
-  [self performCopy:pb];
+  [self performCopy:[NSPasteboard generalPasteboard]];
 }
 
 - (void)cut:(id)sender {
-  NSPasteboard* pb = [NSPasteboard generalPasteboard];
-  [self performCut:pb];
+  [self performCut:[NSPasteboard generalPasteboard]];
 }
 
+- (void)paste:(id)sender {
+  [self performPaste:[NSPasteboard generalPasteboard]];
+}
+
 - (void)performCopy:(NSPasteboard*)pb {
   [pb declareTypes:[NSArray array] owner:nil];
   [self writeSelectionToPasteboard:pb types:
@@ -30,4 +35,14 @@
   [self delete:nil];
 }
 
+// Pastes strip newlines and leading/trailing whitespace (so that split URLs
+// copied from email, etc. end up as "expected"). Eliminating leading/trailing
+// whitespace can't be accomplished elsewhere, so we have to intercept the
+// paste.
+- (void)performPaste:(NSPasteboard*)pb {
+  NSString* pasteString = [pb stringForType:NSStringPboardType];
+  [self insertText:SysWideToNSString(CollapseWhitespace(SysNSStringToWide(
+      pasteString),true))];
+}
+
 @end
Property changes on: chrome/browser/cocoa/autocomplete_text_field_editor.mm
___________________________________________________________________
Name: svn:eol-style
   + LF