Refactor omnibox focus API into a single method.

chrome/browser/ui/search/instant_page.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/common/instant_types.h"
+#include "chrome/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
@@ skipping 34 matching lines @@
     virtual void SetSuggestions(
         const content::WebContents* contents,
         const std::vector<InstantSuggestion>& suggestions) = 0;
 
     // Called when the page wants to be shown. Usually in response to Update()
     // or SendAutocompleteResults().
     virtual void ShowInstantOverlay(const content::WebContents* contents,
                                     int height,
                                     InstantSizeUnits units) = 0;
 
-    // Called when the page wants the omnibox to be focused.
-    virtual void FocusOmnibox(const content::WebContents* contents) = 0;
-
-    // Called when the page wants the omnibox to start capturing user key
-    // strokes. If this call is processed successfully, the omnibox will not
-    // look focused visibly but any user key strokes will go to the omnibox.
-    // Currently, this is implemented by focusing the omnibox invisibly.
-    virtual void StartCapturingKeyStrokes(
-        const content::WebContents* contents) = 0;
-
-    // Called when the page wants the omnibox to stop capturing user key
-    // strokes.
-    virtual void StopCapturingKeyStrokes(content::WebContents* contents) = 0;
+    // Called when the page wants the omnibox to be focused. |state| specifies
+    // whether the omnibox focus state.

[sreeram, 2013/04/01 16:04:38]

Delete "whether".

[kmadhusu, 2013/04/02 02:06:50]

Done.

+    virtual void FocusOmnibox(const content::WebContents* contents,
+                              OmniboxFocusState state) = 0;
 
     // Called when the page wants to navigate to |url|. Usually used by the
     // page to navigate to privileged destinations (e.g. chrome:// URLs) or to
     // navigate to URLs that are hidden from the page using Restricted IDs (rid
     // in the API).
     virtual void NavigateToURL(const content::WebContents* contents,
                                const GURL& url,
                                content::PageTransition transition,
                                WindowOpenDisposition disposition) = 0;
 
@@ skipping 121 matching lines @@
       const GURL& url,
       content::PageTransition transition_type,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   void OnSetSuggestions(int page_id,
                         const std::vector<InstantSuggestion>& suggestions);
   void OnInstantSupportDetermined(int page_id, bool supports_instant);
   void OnShowInstantOverlay(int page_id,
                             int height,
                             InstantSizeUnits units);
-  void OnFocusOmnibox(int page_id);
-  void OnStartCapturingKeyStrokes(int page_id);
-  void OnStopCapturingKeyStrokes(int page_id);
+  void OnFocusOmnibox(int page_id, OmniboxFocusState state);
   void OnSearchBoxNavigate(int page_id,
                            const GURL& url,
                            content::PageTransition transition,
                            WindowOpenDisposition disposition);
   void OnDeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
   void OnUndoMostVisitedDeletion(InstantRestrictedID most_visited_item_id);
   void OnUndoAllMostVisitedDeletions();
 
   Delegate* const delegate_;
   bool supports_instant_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_