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

chrome/browser/ui/search/instant_page.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.

[samarth, 2013/06/19 05:39:20]

Why do you need any changes in this file at all?  (looks like you're getting
some of Kausalya's changes)

 // 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/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 
 InstantPage::Delegate::~Delegate() {
 }
 
 InstantPage::~InstantPage() {
+  if (contents())
+    GetSearchModel()->RemoveObserver(this);
 }
 
 bool InstantPage::supports_instant() const {
   return supports_instant_;
 }
 
 bool InstantPage::IsLocal() const {
   return contents() &&
       (contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||
        contents()->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));
@@ skipping 99 matching lines @@
   Send(new ChromeViewMsg_SearchBoxToggleVoiceSearch(routing_id()));
 }
 
 InstantPage::InstantPage(Delegate* delegate, const std::string& instant_url)
     : delegate_(delegate),
       instant_url_(instant_url),
       supports_instant_(false),
       instant_support_determined_(false) {
 }
 
-void InstantPage::SetContents(content::WebContents* contents) {
-  Observe(contents);
+void InstantPage::SetContents(content::WebContents* web_contents) {
+  if (contents())
+    GetSearchModel()->RemoveObserver(this);
+
+  Observe(web_contents);
+
+  if (!web_contents)
+    return;
+
+  SearchModel* model = GetSearchModel();
+  model->AddObserver(this);
 }
 
 bool InstantPage::ShouldProcessRenderViewCreated() {
   return false;
 }
 
 bool InstantPage::ShouldProcessRenderViewGone() {
   return false;
 }
 
 bool InstantPage::ShouldProcessAboutToNavigateMainFrame() {
   return false;
 }
 
 bool InstantPage::ShouldProcessSetSuggestions() {
   return false;
 }
 
+bool InstantPage::ShouldProcessSetVoiceSearchSupported() {
+  return false;
+}
+
 bool InstantPage::ShouldProcessShowInstantOverlay() {
   return false;
 }
 
 bool InstantPage::ShouldProcessFocusOmnibox() {
   return false;
 }
 
 bool InstantPage::ShouldProcessNavigateToURL() {
   return false;
@@ skipping 76 matching lines @@
     int64 /* frame_id */,
     bool is_main_frame,
     const GURL& /* validated_url */,
     int /* error_code */,
     const string16& /* error_description */,
     content::RenderViewHost* /* render_view_host */) {
   if (is_main_frame)
     delegate_->InstantPageLoadFailed(contents());
 }
 
+void InstantPage::ModelChanged(const SearchModel::State& old_state,
+                               const SearchModel::State& new_state) {
+  if (ShouldProcessSetVoiceSearchSupported() &&
+      old_state.voice_search_supported != new_state.voice_search_supported)
+    delegate_->SetVoiceSearchSupported(
+        contents(), new_state.voice_search_supported);
+}
+
+SearchModel* InstantPage::GetSearchModel() {
+  return contents() ?
+      SearchTabHelper::FromWebContents(contents())->model() : NULL;
+}
+
 void InstantPage::OnSetSuggestions(
     int page_id,
     const std::vector<InstantSuggestion>& suggestions) {
   if (!contents()->IsActiveEntry(page_id))
     return;
 
   OnInstantSupportDetermined(page_id, true);
   if (!ShouldProcessSetSuggestions())
     return;
 
@@ skipping 82 matching lines @@
 void InstantPage::OnUndoAllMostVisitedDeletions(int page_id) {
   if (!contents()->IsActiveEntry(page_id))
     return;
 
   OnInstantSupportDetermined(page_id, true);
   if (!ShouldProcessUndoAllMostVisitedDeletions())
     return;
 
   delegate_->UndoAllMostVisitedDeletions();
 }