Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: trunk/src/chrome/browser/ui/search/search_model.cc

Issue 16124009: Revert 204709 "Move instant support to SearchTabHelper." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/search/search_model.cc
===================================================================
--- trunk/src/chrome/browser/ui/search/search_model.cc (revision 204944)
+++ trunk/src/chrome/browser/ui/search/search_model.cc (working copy)
@@ -7,24 +7,6 @@
#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,
- InstantSupportState instant_support)
- : mode(mode),
- top_bars_visible(top_bars_visible),
- instant_support(instant_support) {
-}
-
-bool SearchModel::State::operator==(const State& rhs) const {
- return mode == rhs.mode && top_bars_visible == rhs.top_bars_visible &&
- instant_support == rhs.instant_support;
-}
-
SearchModel::SearchModel() {
}
@@ -95,23 +77,6 @@
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);
}
« no previous file with comments | « trunk/src/chrome/browser/ui/search/search_model.h ('k') | trunk/src/chrome/browser/ui/search/search_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698