[Mac] Expose AutocompleteEditViewMac to Cocoa code.

chrome/browser/autocomplete/autocomplete_edit_view_mac.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.
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 #include "app/gfx/font.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/clipboard.h"
 #import "base/cocoa_protocols_mac.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/cocoa/autocomplete_text_field.h"
 #include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 
 // Focus-handling between |field_| and |model_| is a bit subtle.
 // Other platforms detect change of focus, which is inconvenient
 // without subclassing NSTextField (even with a subclass, the use of a
 // field editor may complicate things).
 //
 // |model_| doesn't actually do anything when it gains focus, it just
@@ skipping 91 matching lines @@
   return NSMakeRange(static_cast<NSInteger>(component.begin),
                      static_cast<NSInteger>(component.len));
 }
 
 }  // namespace
 
 // Thin Obj-C bridge class that is the delegate of the omnibox field.
 // It intercepts various control delegate methods and vectors them to
 // the edit view.
 
+// TODO(shess): Consider moving more of this code off to
+// AutocompleteTextFieldObserver.
+
 @interface AutocompleteFieldDelegate : NSObject<NSTextFieldDelegate> {
  @private
   AutocompleteEditViewMac* edit_view_;  // weak, owns us.
 }
 - initWithEditView:(AutocompleteEditViewMac*)view;
 - (void)windowDidResignKey:(NSNotification*)notification;
 @end
 
 // TODO(shess): AutocompletePopupViewMac doesn't really need an
 // NSTextField.  It wants to know where the position the popup, what
@@ skipping 13 matching lines @@
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       field_(field),
       edit_helper_([[AutocompleteFieldDelegate alloc] initWithEditView:this]) {
   DCHECK(controller);
   DCHECK(toolbar_model);
   DCHECK(profile);
   DCHECK(command_updater);
   DCHECK(field);
   [field_ setDelegate:edit_helper_.get()];
+  [field_ setObserver:this];
 
   // Needed so that editing doesn't lose the styling.
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Track the window's key status for signalling focus changes to
   // |model_|.
   NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
   [nc addObserver:edit_helper_
          selector:@selector(windowDidResignKey:)
              name:NSWindowDidResignKeyNotification
            object:[field_ window]];
 }
 
 AutocompleteEditViewMac::~AutocompleteEditViewMac() {
   // TODO(shess): Having to be aware of destructor ordering in this
   // way seems brittle.  There must be a better way.
 
   // Destroy popup view before this object in case it tries to call us
   // back in the destructor.  Likewise for destroying the model before
   // this object.
   popup_view_.reset();
   model_.reset();
 
   // Disconnect field_ from edit_helper_ so that we don't get calls
   // after destruction.
   [field_ setDelegate:nil];
+  [field_ setObserver:NULL];
 }
 
 void AutocompleteEditViewMac::SaveStateToTab(TabContents* tab) {
   DCHECK(tab);
 
   const bool hasFocus = [field_ currentEditor] ? true : false;
 
   NSRange range;
   if (hasFocus) {
     range = GetSelectedRange();
@@ skipping 651 matching lines @@
 
 - (BOOL)control:(NSControl*)control textShouldEndEditing:(NSText*)fieldEditor {
   edit_view_->OnDidEndEditing();
 
   return YES;
 
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }
 
-// AutocompleteTextField/Editor adds a delegate method which allows us
-// to intercept and handle -paste: calls.
-- (BOOL)control:(NSControl*)control textShouldPaste:(NSText*)fieldEditor {
-  edit_view_->OnPaste();
-
-  // Caller shouldn't also paste.
-  return NO;
-}
-
 - (NSString*)control:(NSControl*)control
              textPasteActionString:(NSText*)fieldEditor {
   if (!edit_view_->CanPasteAndGo())
     return nil;
 
   return l10n_util::GetNSStringWithFixup(edit_view_->GetPasteActionStringId());
 }
 
 - (void)control:(NSControl*)control textDidPasteAndGo:(NSText*)fieldEditor {
   edit_view_->OnPasteAndGo();
 }
 
 // Signal that we've lost focus when the window resigns key.
 - (void)windowDidResignKey:(NSNotification*)notification {
   edit_view_->OnDidResignKey();
 }
 
-// AutocompleteTextField adds a delegate method which allows us to
-// track -flagsChanged: calls.
-//
-// When the user types Control-Enter, the existing content has "www."
-// prepended and ".com" appended.  This calls down to
-// AutocompleteEditModel::OnControlKeyChanged() so that it can change
-// the popup to reflect this.  See autocomplete_edit.cc
-// OnControlKeyChanged() and OnAfterPossibleChange().
-- (void)control:(NSControl*)control flagsChanged:(NSEvent*)theEvent {
-  bool controlFlag = ([theEvent modifierFlags]&NSControlKeyMask) != 0;
-  edit_view_->OnControlKeyChanged(controlFlag);
-}
-
 @end