Mac: Fix errors in adding the "Paste & Go" menu item.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
@@ skipping 31 matching lines @@
 BOOL ThePasteboardIsTooDamnBig() {
   NSPasteboard* pb = [NSPasteboard generalPasteboard];
   NSString* type =
       [pb availableTypeFromArray:[NSArray arrayWithObject:NSStringPboardType]];
   if (!type)
     return NO;
 
   return [[pb stringForType:type] length] > kMaxPasteLength;
 }
 
+// Returns a possibly disabled "Paste and {Go, Search}" menu item.
+NSMenuItem* PasteAndGoMenuItemForObserver(
+    AutocompleteTextFieldObserver* observer) {
+  DCHECK(observer);
+  int string_id = IDS_PASTE_AND_GO;
+  BOOL enabled = !ThePasteboardIsTooDamnBig() && observer->CanPasteAndGo();
+  if (enabled)
+    string_id = observer->GetPasteActionStringId();
+
+  NSString* title = l10n_util::GetNSStringWithFixup(string_id);
+  base::scoped_nsobject<NSMenuItem> item([[NSMenuItem alloc]
+      initWithTitle:title
+             action:@selector(pasteAndGo:)
+      keyEquivalent:@""]);
+  [item setEnabled:enabled];
+  return item.autorelease();
+}
+
 }  // namespace
 
 @interface AutocompleteTextFieldEditor ()<NSDraggingSource>
 @end
 
 @implementation AutocompleteTextFieldEditor
 
 - (BOOL)shouldDrawInsertionPoint {
   return [super shouldDrawInsertionPoint] &&
          ![[[self delegate] cell] hideFocusState];
@@ skipping 216 matching lines @@
                   action:@selector(cut:)
            keyEquivalent:@""];
   [menu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_COPY)
                   action:@selector(copy:)
            keyEquivalent:@""];
 
   [menu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_PASTE)
                   action:@selector(paste:)
            keyEquivalent:@""];
 
-  // TODO(shess): If the control is not editable, should we show a
-  // greyed-out "Paste and Go"?
   if ([self isEditable]) {
-    // Paste and go/search.
-    AutocompleteTextFieldObserver* observer = [self observer];
-    DCHECK(observer);
-    if (!ThePasteboardIsTooDamnBig()) {
-      NSString* pasteAndGoLabel =
-          l10n_util::GetNSStringWithFixup(observer->GetPasteActionStringId());
-      DCHECK([pasteAndGoLabel length]);
-      [menu addItemWithTitle:pasteAndGoLabel
-                      action:@selector(pasteAndGo:)
-               keyEquivalent:@""];
-    }
-
+    [menu addItem:PasteAndGoMenuItemForObserver([self observer])];
     [menu addItem:[NSMenuItem separatorItem]];
 
     NSString* searchEngineLabel =
         l10n_util::GetNSStringWithFixup(IDS_EDIT_SEARCH_ENGINES);
     DCHECK([searchEngineLabel length]);
     NSMenuItem* item = [menu addItemWithTitle:searchEngineLabel
                                        action:@selector(commandDispatch:)
                                 keyEquivalent:@""];
     [item setTag:IDC_EDIT_SEARCH_ENGINES];
   }
@@ skipping 245 matching lines @@
 
   // The text has been changed programmatically. The observer should know
   // this change, so setting |textChangedByKeyEvents_| to NO to
   // prevent its OnDidChange() method from being called unnecessarily.
   textChangedByKeyEvents_ = NO;
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem*)item {
   if ([item action] == @selector(copyToFindPboard:))
     return [self selectedRange].length > 0;
-  if ([item action] == @selector(pasteAndGo:)) {
-    // TODO(rohitrao): If the clipboard is empty, should we show a
-    // greyed-out "Paste and Go" or nothing at all?
-    AutocompleteTextFieldObserver* observer = [self observer];
-    DCHECK(observer);
-    return observer->CanPasteAndGo();
-  }
+
+  // Paste & Go doesn't appear in the mainMenu. Use the enabled state when the
+  // menu item was added in -menuForEvent:.
+  if ([item action] == @selector(pasteAndGo:))
+    return [item isEnabled];
+
   return [super validateMenuItem:item];
 }
 
 - (void)copyToFindPboard:(id)sender {
   NSRange selectedRange = [self selectedRange];
   if (selectedRange.length == 0)
     return;
   NSAttributedString* selection =
       [self attributedSubstringForProposedRange:selectedRange
                                     actualRange:NULL];
@@ skipping 21 matching lines @@
 // ThemedWindowDrawing implementation.
 
 - (void)windowDidChangeTheme {
   [self updateColorsToMatchTheme];
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end