Move instant support to SearchTabHelper.

chrome/browser/ui/search/search_model.cc

Index: chrome/browser/ui/search/search_model.cc
diff --git a/chrome/browser/ui/search/search_model.cc b/chrome/browser/ui/search/search_model.cc
index 53d0fcc9efd245bd685085d5c55051b98176cf6e..c77eb1fc70e1ec9d100d9592375af9a99ad483a5 100644
--- a/chrome/browser/ui/search/search_model.cc
+++ b/chrome/browser/ui/search/search_model.cc
@@ -7,6 +7,22 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 
+SearchModel::State::State()
+    : top_bars_visible(true),
+      instant_support(INSTANT_SUPPORT_UNKNOWN) {
+}
+
+SearchModel::State::State(const SearchMode& mode, bool top_bars_visible)

[samarth, 2013/05/08 02:38:48]

How is this constructor used.  Does it also make sense there to send over the
instant support bit?

[kmadhusu, 2013/05/09 02:40:40]

This constructor is used in SearchTabHelper::UpdateMode(). We can send over the
instant support bit from SearchTabHelper to here. Modified the constructor to
accept the InstantSupportState param.

+    : mode(mode),
+    top_bars_visible(top_bars_visible),

[samarth, 2013/05/08 02:38:48]

nit: indent

[kmadhusu, 2013/05/09 02:40:40]

Done.

+    instant_support(INSTANT_SUPPORT_UNKNOWN) {
+}
+
+bool SearchModel::State::operator==(const State& rhs) const {
+  return (mode == rhs.mode) && (top_bars_visible == rhs.top_bars_visible) &&

[samarth, 2013/05/08 02:38:48]

nit: leave out the parens here.

[kmadhusu, 2013/05/09 02:40:40]

Done.

+      (instant_support == rhs.instant_support);
+}
+
 SearchModel::SearchModel() {
 }
 
@@ -77,6 +93,24 @@ void SearchModel::SetTopBarsVisible(bool visible) {
                     ModelChanged(old_state, state_));
 }
 
+void SearchModel::SetSupportsInstant(bool supports_instant) {
+  DCHECK(chrome::IsInstantExtendedAPIEnabled())
+      << "Please do not try to set the SearchModel mode without first "
+      << "checking if Search is enabled.";
+
+  InstantSupportState new_instant_support = supports_instant ?
+      INSTANT_SUPPORT_YES : INSTANT_SUPPORT_NO;
+
+  if (state_.instant_support == new_instant_support)
+    return;
+
+  const State old_state = state_;
+  state_.instant_support = new_instant_support;
+
+  FOR_EACH_OBSERVER(SearchModelObserver, observers_,
+                    ModelChanged(old_state, state_));
+}
+
 void SearchModel::AddObserver(SearchModelObserver* observer) {
   observers_.AddObserver(observer);
 }