Refactor omnibox focus API into a single method.

chrome/browser/ui/search/instant_page.cc

 // 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.
 
 #include "chrome/browser/ui/search/instant_page.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 143 matching lines @@
 
 bool InstantPage::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(InstantPage, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetSuggestions, OnSetSuggestions)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowInstantOverlay,
                         OnShowInstantOverlay)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FocusOmnibox, OnFocusOmnibox)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_StartCapturingKeyStrokes,
-                        OnStartCapturingKeyStrokes);
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_StopCapturingKeyStrokes,
-                        OnStopCapturingKeyStrokes);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxNavigate,
                         OnSearchBoxNavigate);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem,
                         OnDeleteMostVisitedItem);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion,
                         OnUndoMostVisitedDeletion);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions,
                         OnUndoAllMostVisitedDeletions);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 43 matching lines @@
 void InstantPage::OnShowInstantOverlay(int page_id,
                                        int height,
                                        InstantSizeUnits units) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
     if (ShouldProcessShowInstantOverlay())
       delegate_->ShowInstantOverlay(contents(), height, units);
   }
 }
 
-void InstantPage::OnFocusOmnibox(int page_id) {
+void InstantPage::OnFocusOmnibox(int page_id, OmniboxFocusState state) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
-    if (ShouldProcessFocusOmnibox())
-      delegate_->FocusOmnibox(contents());
+    switch (state) {
+      case OMNIBOX_FOCUS_VISIBLE:
+        if (ShouldProcessFocusOmnibox())
+          delegate_->FocusOmnibox(contents());
+        break;
+      case OMNIBOX_FOCUS_INVISIBLE:
+        if (ShouldProcessStartCapturingKeyStrokes())
+          delegate_->StartCapturingKeyStrokes(contents());
+        break;
+      case OMNIBOX_FOCUS_NONE:
+        if (ShouldProcessStopCapturingKeyStrokes())
+          delegate_->StopCapturingKeyStrokes(contents());

[kmadhusu, 2013/03/26 18:56:17]

From my understanding of the bug report, we want to get rid of
StartCapturingKeyStrokes IPC and StopCapturingKeyStrokes IPC.

I would like to keep InstantPage::Delegate::StartCapturingKeyStrokes() and
InstantPage::Delegate::StopCapturingKeyStorkes() for better understanding of the
code. WDYT?

[sreeram, 2013/03/26 19:01:24]

Let's not. InstantPage should be a simple message relay, and complicated logic
doesn't belong here. So, do these in InstantController instead.

[kmadhusu, 2013/03/26 21:04:00]

Done. Moved this logic to InstantController.

Can you tell me the use case when ShouldProcessStopCapturingKeyStrokes() or
ShouldProcessStartCapturingKeyStrokes() returns false? Is it okay to do these
checks in InstantController?

+        break;
+      default:
+        NOTREACHED();
+    }
   }
 }
 
-void InstantPage::OnStartCapturingKeyStrokes(int page_id) {
-  if (contents()->IsActiveEntry(page_id)) {
-    OnInstantSupportDetermined(page_id, true);
-    if (ShouldProcessStartCapturingKeyStrokes())
-      delegate_->StartCapturingKeyStrokes(contents());
-  }
-}
-
-void InstantPage::OnStopCapturingKeyStrokes(int page_id) {
-  if (contents()->IsActiveEntry(page_id)) {
-    OnInstantSupportDetermined(page_id, true);
-    if (ShouldProcessStopCapturingKeyStrokes())
-      delegate_->StopCapturingKeyStrokes(contents());
-  }
-}
-
 void InstantPage::OnSearchBoxNavigate(int page_id,
                                       const GURL& url,
                                       content::PageTransition transition,
                                       WindowOpenDisposition disposition) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
     if (ShouldProcessNavigateToURL())
       delegate_->NavigateToURL(contents(), url, transition, disposition);
   }
 }
 
 void InstantPage::OnDeleteMostVisitedItem(InstantRestrictedID restricted_id) {
   delegate_->DeleteMostVisitedItem(restricted_id);
 }
 
 void InstantPage::OnUndoMostVisitedDeletion(InstantRestrictedID restricted_id) {
   delegate_->UndoMostVisitedDeletion(restricted_id);
 }
 
 void InstantPage::OnUndoAllMostVisitedDeletions() {
   delegate_->UndoAllMostVisitedDeletions();
 }