[Mac] Fix operation of Control key in Omnibox.

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/resource_bundle.h"
 #include "base/clipboard.h"
@@ skipping 555 matching lines @@
   // We should only arrive here when the field is focussed.
   DCHECK(IsFirstResponder());
 
   model_->OnEscapeKeyPressed();
 }
 
 void AutocompleteEditViewMac::OnWillBeginEditing() {
   // We should only arrive here when the field is focussed.
   DCHECK([field_ currentEditor]);
 
-  // TODO(shess): Detect control-key situation.  Since this code is
-  // called on first edit, not on receipt of focus, it may be that we
-  // cannot correctly handle this without refactoring.
-  const bool controlDown = false;
+  NSEvent* theEvent = [NSApp currentEvent];
+  const bool controlDown = ([theEvent modifierFlags]&NSControlKeyMask) != 0;
   model_->OnSetFocus(controlDown);
 
   // Capture the current state.
   OnBeforePossibleChange();
 }
 
 void AutocompleteEditViewMac::OnDidEndEditing() {
   ClosePopup();
 
   // Tell the model to reset itself.
@@ skipping 250 matching lines @@
 
 // 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;
+  bool controlFlag = ([theEvent modifierFlags]&NSControlKeyMask) != 0;
   edit_view_->OnControlKeyChanged(controlFlag);
 }
 
 @end