Add setVoiceSearchSupported to the searchbox API. This will be used to determine whether to show a …

chrome/browser/ui/search/search_tab_helper.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/browser/ui/search/search_tab_helper.h"
 
 #include "chrome/browser/search/search.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 73 matching lines @@
   return true;
 }
 
 void SearchTabHelper::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
   UpdateMode();
   last_known_most_visited_items_.clear();
+  model_.SetVoiceSearchSupported(false);

[samarth, 2013/06/19 22:55:16]

Sorry, this is a bit more subtle. You should do this unless the navigation was
"in-page".  Kausalya's adding checks for that in
https://codereview.chromium.org/16035020/ so if you wait for her change to land
and sync past it, you can pick up that change.

[jeremycho, 2013/06/20 19:35:52]

Done.

 }
 
 bool SearchTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchTabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxShowBars,
                         OnSearchBoxShowBars)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxHideBars,
                         OnSearchBoxHideBars)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetVoiceSearchSupported,
+                        OnSetVoiceSearchSupported)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SearchTabHelper::UpdateMode() {
   SearchMode::Type type = SearchMode::MODE_DEFAULT;
   SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;
   if (IsNTP(web_contents_)) {
     type = SearchMode::MODE_NTP;
     origin = SearchMode::ORIGIN_NTP;
   } else if (IsSearchResults(web_contents_)) {
     type = SearchMode::MODE_SEARCH_RESULTS;
     origin = SearchMode::ORIGIN_SEARCH;
   }
   if (user_input_in_progress_)
     type = SearchMode::MODE_SEARCH_SUGGESTIONS;
 
   if (type == SearchMode::MODE_NTP && origin == SearchMode::ORIGIN_NTP &&
       !popup_is_open_ && !user_text_is_empty_) {
     // We're switching back (|popup_is_open_| is false) to an NTP (type and
     // mode are |NTP|) with suggestions (|user_text_is_empty_| is false), don't
-    // modify visibility of top bars.  This specific omnibox state is set when
-    // OmniboxEditModelChanged() is called from
+    // modify visibility of top bars or voice search support.  This specific
+    // omnibox state is set when OmniboxEditModelChanged() is called from
     // OmniboxEditModel::SetInputInProgress() which is called from
     // OmniboxEditModel::Revert().
     model_.SetState(SearchModel::State(SearchMode(type, origin),
-                                       model_.state().top_bars_visible));
+                                       model_.state().top_bars_visible,
+                                       model_.state().voice_search_supported));
   } else {
     model_.SetMode(SearchMode(type, origin));
   }
 }
 
 void SearchTabHelper::OnSearchBoxShowBars(int page_id) {
   if (web_contents()->IsActiveEntry(page_id))
     model_.SetTopBarsVisible(true);
 }
 
 void SearchTabHelper::OnSearchBoxHideBars(int page_id) {
   if (web_contents()->IsActiveEntry(page_id)) {
     model_.SetTopBarsVisible(false);
     Send(new ChromeViewMsg_SearchBoxBarsHidden(routing_id()));
   }
 }
+
+void SearchTabHelper::OnSetVoiceSearchSupported(int page_id, bool supported) {
+  if (web_contents()->IsActiveEntry(page_id))
+    model_.SetVoiceSearchSupported(supported);
+}