diff options
Diffstat (limited to 'chrome/browser/autocomplete')
4 files changed, 55 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index dc58fce..08a4852 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -22,10 +22,10 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/search_engines_switches.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index be8d744..e1320f6 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -284,14 +284,28 @@ class SearchTermsDataSnapshot : public SearchTermsData { virtual base::string16 GetRlzParameterValue( bool from_app_list) const OVERRIDE; virtual std::string GetSearchClient() const OVERRIDE; + virtual bool EnableAnswersInSuggest() const OVERRIDE; + virtual bool IsShowingSearchTermsOnSearchResultsPages() const OVERRIDE; + virtual std::string InstantExtendedEnabledParam( + bool for_search) const OVERRIDE; + virtual std::string ForceInstantResultsParam( + bool for_prerender) const OVERRIDE; virtual std::string NTPIsThemedParam() const OVERRIDE; + virtual std::string GoogleImageSearchSource() const OVERRIDE; private: std::string google_base_url_value_; std::string application_locale_; base::string16 rlz_parameter_value_; std::string search_client_; + bool enable_answers_in_suggest_; + bool is_showing_search_terms_on_search_results_pages_; + std::string instant_extended_enabled_param_; + std::string instant_extended_enabled_param_for_search_; + std::string force_instant_results_param_; + std::string force_instant_results_param_for_prerender_; std::string ntp_is_themed_param_; + std::string google_image_search_source_; DISALLOW_COPY_AND_ASSIGN(SearchTermsDataSnapshot); }; @@ -302,7 +316,20 @@ SearchTermsDataSnapshot::SearchTermsDataSnapshot( application_locale_(search_terms_data.GetApplicationLocale()), rlz_parameter_value_(search_terms_data.GetRlzParameterValue(false)), search_client_(search_terms_data.GetSearchClient()), - ntp_is_themed_param_(search_terms_data.NTPIsThemedParam()) {} + enable_answers_in_suggest_(search_terms_data.EnableAnswersInSuggest()), + is_showing_search_terms_on_search_results_pages_( + search_terms_data.IsShowingSearchTermsOnSearchResultsPages()), + instant_extended_enabled_param_( + search_terms_data.InstantExtendedEnabledParam(false)), + instant_extended_enabled_param_for_search_( + search_terms_data.InstantExtendedEnabledParam(true)), + force_instant_results_param_( + search_terms_data.ForceInstantResultsParam(false)), + force_instant_results_param_for_prerender_( + search_terms_data.ForceInstantResultsParam(true)), + ntp_is_themed_param_(search_terms_data.NTPIsThemedParam()), + google_image_search_source_(search_terms_data.GoogleImageSearchSource()) { +} SearchTermsDataSnapshot::~SearchTermsDataSnapshot() { } @@ -324,10 +351,34 @@ std::string SearchTermsDataSnapshot::GetSearchClient() const { return search_client_; } +bool SearchTermsDataSnapshot::EnableAnswersInSuggest() const { + return enable_answers_in_suggest_; +} + +bool SearchTermsDataSnapshot::IsShowingSearchTermsOnSearchResultsPages() const { + return is_showing_search_terms_on_search_results_pages_; +} + +std::string SearchTermsDataSnapshot::InstantExtendedEnabledParam( + bool for_search) const { + return for_search ? instant_extended_enabled_param_ : + instant_extended_enabled_param_for_search_; +} + +std::string SearchTermsDataSnapshot::ForceInstantResultsParam( + bool for_prerender) const { + return for_prerender ? force_instant_results_param_ : + force_instant_results_param_for_prerender_; +} + std::string SearchTermsDataSnapshot::NTPIsThemedParam() const { return ntp_is_themed_param_; } +std::string SearchTermsDataSnapshot::GoogleImageSearchSource() const { + return google_image_search_source_; +} + // ----------------------------------------------------------------- // HistoryURLProvider diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index 4f396cf..7aa2f39 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/autocomplete/keyword_provider.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" -#include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.h" #include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/search_engines_switches.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 667f794..e80e6e7 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -39,6 +39,7 @@ #include "components/google/core/browser/google_switches.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_engine_type.h" +#include "components/search_engines/search_engines_switches.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/pref_names.h" #include "components/variations/entropy_provider.h" |