Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

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

 // Copyright 2012 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/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 317 matching lines @@
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   omnibox_view_->model()->AcceptInput(disposition, false);
 }
 
 void LocationBarViewMac::FocusLocation(bool select_all) {
   omnibox_view_->FocusLocation(select_all);
 }
 
 void LocationBarViewMac::FocusSearch() {
-  omnibox_view_->SetForcedQuery();
+  omnibox_view_->EnterKeywordModeForDefaultSearchProvider();
 }
 
 void LocationBarViewMac::UpdateContentSettingsIcons() {
   if (RefreshContentSettingsDecorations())
     OnDecorationsChanged();
 }
 
 void LocationBarViewMac::UpdateManagePasswordsIconAndBubble() {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
@@ skipping 620 matching lines @@
 
   return zoom_decoration_->UpdateIfNecessary(
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }