Refactor omnibox focus API into a single method.

chrome/renderer/searchbox/searchbox.cc

 // 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.
 
 #include "chrome/renderer/searchbox/searchbox.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/omnibox_focus_state.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 71 matching lines @@
 }
 
 void SearchBox::ShowInstantOverlay(int height, InstantSizeUnits units) {
   render_view()->Send(new ChromeViewHostMsg_ShowInstantOverlay(
       render_view()->GetRoutingID(), render_view()->GetPageId(), height,
       units));
 }
 
 void SearchBox::FocusOmnibox() {
   render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
-      render_view()->GetRoutingID(), render_view()->GetPageId()));
+      render_view()->GetRoutingID(), render_view()->GetPageId(),
+      OMNIBOX_FOCUS_VISIBLE));
 }
 
 void SearchBox::StartCapturingKeyStrokes() {
-  render_view()->Send(new ChromeViewHostMsg_StartCapturingKeyStrokes(
-      render_view()->GetRoutingID(), render_view()->GetPageId()));
+  render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
+      render_view()->GetRoutingID(), render_view()->GetPageId(),
+      OMNIBOX_FOCUS_INVISIBLE));
 }
 
 void SearchBox::StopCapturingKeyStrokes() {
-  render_view()->Send(new ChromeViewHostMsg_StopCapturingKeyStrokes(
-      render_view()->GetRoutingID(), render_view()->GetPageId()));
+  render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
+      render_view()->GetRoutingID(), render_view()->GetPageId(),
+      OMNIBOX_FOCUS_NONE));
 }
 
 void SearchBox::NavigateToURL(const GURL& url,
                               content::PageTransition transition,
                               WindowOpenDisposition disposition) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxNavigate(
       render_view()->GetRoutingID(), render_view()->GetPageId(),
       url, transition, disposition));
 }
 
@@ skipping 343 matching lines @@
 
   string16 trimmedUserInput;
   TrimWhitespace(query(), TRIM_LEADING, &trimmedUserInput);
   if (EndsWith(*url, trimmedUserInput, true))
     return;
 
   // Strip a lone trailing slash.
   if (EndsWith(*url, ASCIIToUTF16("/"), true))
     url->erase(url->length() - 1, 1);
 }