[Mac] Refactor location-bar autocomplete cell classes.

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2009 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/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
+#import "chrome/browser/cocoa/autocomplete_text_field.h"
+#import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
 // Names of images in the bundle for the star icon (normal and 'starred').
 static NSString* const kStarImageName = @"star_Template.pdf";
 static NSString* const kStarredImageName = @"starred.pdf";
 
-@implementation LocationBarFieldEditor
-- (void)copy:(id)sender {
-  NSPasteboard* pb = [NSPasteboard generalPasteboard];
-  [self performCopy:pb];
-}
-
-- (void)cut:(id)sender {
-  NSPasteboard* pb = [NSPasteboard generalPasteboard];
-  [self performCut:pb];
-}
-
-- (void)performCopy:(NSPasteboard*)pb {
-  [pb declareTypes:[NSArray array] owner:nil];
-  [self writeSelectionToPasteboard:pb types:
-      [NSArray arrayWithObject:NSStringPboardType]];
-}
-
-- (void)performCut:(NSPasteboard*)pb {
-  [self performCopy:pb];
-  [self delete:nil];
-}
-
-@end
-
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
 @end
 
 namespace ToolbarControllerInternal {
 
 // A C++ class registered for changes in preferences. Bridges the
 // notification back to the ToolbarController.
 class PrefObserverBridge : public NotificationObserver {
@@ skipping 180 matching lines @@
   // TODO(jrg): investigate non-Mac Chrome behavior and possibly expand this.
   if (hasToolbar_ == NO)
     return nil;
   return bookmarkBarController_.get();
 }
 
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
     // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
-    if (locationBarFieldEditor_.get() == nil) {
-      locationBarFieldEditor_.reset([[LocationBarFieldEditor alloc] init]);
+    if (autocompleteTextFieldEditor_.get() == nil) {
+      autocompleteTextFieldEditor_.reset(
+          [[AutocompleteTextFieldEditor alloc] init]);
     }
 
     // This needs to be called every time, otherwise notifications
     // aren't sent correctly.
-    DCHECK(locationBarFieldEditor_.get());
-    [locationBarFieldEditor_.get() setFieldEditor:YES];
-    return locationBarFieldEditor_.get();
+    DCHECK(autocompleteTextFieldEditor_.get());
+    [autocompleteTextFieldEditor_.get() setFieldEditor:YES];
+    return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
 
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
             homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
             locationBar_, nil];
 }
@@ skipping 76 matching lines @@
                    forView:pageButton_];
 }
 
 - (IBAction)showWrenchMenu:(id)sender {
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 @end