Add support for receiving text from system services on Mac.

BUG=20868
TEST=manual

Review: http://codereview.chromium.org/3158026

Review URL: http://codereview.chromium.org/3158026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57087 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/app_controller_mac.mm

@@ -882,14 +882,10 @@ void RecordLastRunAppBundlePath() {
 }
 
 - (void)registerServicesMenuTypesTo:(NSApplication*)app {
-  // Currently we only support one-way service requests and don't
-  // support services that have return values such as the PGP
-  // encryption service.
-  // Also note that RenderWidgetHostViewCocoa implements
-  // NSServicesRequests which handles requests from services.
-  NSArray* sendTypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
-  NSArray* returnTypes = [NSArray array];
-  [app registerServicesMenuSendTypes:sendTypes returnTypes:returnTypes];
+  // Note that RenderWidgetHostViewCocoa implements NSServicesRequests which
+  // handles requests from services.
+  NSArray* types = [NSArray arrayWithObjects:NSStringPboardType, nil];
+  [app registerServicesMenuSendTypes:types returnTypes:types];
 }
 
 - (Profile*)defaultProfile {

chrome/browser/renderer_host/render_widget_host_view_mac.mm

@@ -2273,12 +2273,24 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
 
 - (id)validRequestorForSendType:(NSString*)sendType
                      returnType:(NSString*)returnType {
-  if ([sendType isEqual:NSStringPboardType] && !returnType &&
-      !renderWidgetHostView_->selected_text().empty()) {
-    return self;
+  id requestor = nil;
+  BOOL sendTypeIsString = [sendType isEqual:NSStringPboardType];
+  BOOL returnTypeIsString = [returnType isEqual:NSStringPboardType];
+  BOOL hasText = !renderWidgetHostView_->selected_text().empty();
+  BOOL takesText =
+      renderWidgetHostView_->text_input_type_ != WebKit::WebTextInputTypeNone;
+
+  if (sendTypeIsString && hasText && !returnType) {
+    requestor = self;
+  } else if (!sendType && returnTypeIsString && takesText) {
+    requestor = self;
+  } else if (sendTypeIsString && returnTypeIsString && hasText && takesText) {
+    requestor = self;
+  } else {
+    requestor = [super validRequestorForSendType:sendType
+                                      returnType:returnType];
   }
-
-  return [super validRequestorForSendType:sendType returnType:returnType];
+  return requestor;
 }
 
 @end
@@ -2290,11 +2302,9 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
 
 - (BOOL)writeSelectionToPasteboard:(NSPasteboard*)pboard
                              types:(NSArray*)types {
-  if (![types containsObject:NSStringPboardType] ||
-      renderWidgetHostView_->selected_text().empty())
-    return NO;
-
   const std::string& str = renderWidgetHostView_->selected_text();
+  if (![types containsObject:NSStringPboardType] || str.empty()) return NO;
+
   scoped_nsobject<NSString> text([[NSString alloc]
                                    initWithUTF8String:str.c_str()]);
   NSArray* toDeclare = [NSArray arrayWithObject:NSStringPboardType];
@@ -2303,7 +2313,14 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
 }
 
 - (BOOL)readSelectionFromPasteboard:(NSPasteboard*)pboard {
-  return NO;
+  NSString *string = [pboard stringForType:NSStringPboardType];
+  if (!string) return NO;
+
+  // If the user is currently using an IME, confirm the IME input,
+  // and then insert the text from the service, the same as TextEdit and Safari.
+  [self confirmComposition];
+  [self insertText:string];
+  return YES;
 }
 
 @end