Index: chrome/browser/search_engines/ui_thread_search_terms_data.h |
diff --git a/chrome/browser/search_engines/search_terms_data.h b/chrome/browser/search_engines/ui_thread_search_terms_data.h |
similarity index 37% |
copy from chrome/browser/search_engines/search_terms_data.h |
copy to chrome/browser/search_engines/ui_thread_search_terms_data.h |
index 7167374166c0c9ed74a236a05e5e80dfe6827c62..eb42a9169cf87d81e607c19a8eebbe4adfd0f0b6 100644 |
--- a/chrome/browser/search_engines/search_terms_data.h |
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.h |
@@ -2,66 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_ |
-#define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_ |
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_UI_THREAD_SEARCH_TERMS_DATA_H_ |
+#define CHROME_BROWSER_SEARCH_ENGINES_UI_THREAD_SEARCH_TERMS_DATA_H_ |
#include <string> |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/strings/string16.h" |
+#include "components/search_engines/search_terms_data.h" |
class Profile; |
-// All data needed by TemplateURLRef::ReplaceSearchTerms which typically may |
-// only be accessed on the UI thread. |
-class SearchTermsData { |
- public: |
- SearchTermsData(); |
- virtual ~SearchTermsData(); |
- |
- // Returns the value to use for replacements of type GOOGLE_BASE_URL. This |
- // implementation simply returns the default value. |
- virtual std::string GoogleBaseURLValue() const; |
- |
- // Returns the value for the GOOGLE_BASE_SUGGEST_URL term. This |
- // implementation simply returns the default value. |
- std::string GoogleBaseSuggestURLValue() const; |
- |
- // Returns the locale used by the application. This implementation returns |
- // "en" and thus should be overridden where the result is actually meaningful. |
- virtual std::string GetApplicationLocale() const; |
- |
- // Returns the value for the Chrome Omnibox rlz. This implementation returns |
- // the empty string. |
- virtual base::string16 GetRlzParameterValue(bool from_app_list) const; |
- |
- // The optional client parameter passed with Google search requests. This |
- // implementation returns the empty string. |
- virtual std::string GetSearchClient() const; |
- |
- // The suggest client parameter ("client") passed with Google suggest |
- // requests. See GetSuggestRequestIdentifier() for more details. |
- // This implementation returns the empty string. |
- virtual std::string GetSuggestClient() const; |
- |
- // The suggest request identifier parameter ("gs_ri") passed with Google |
- // suggest requests. Along with suggestclient (See GetSuggestClient()), |
- // this parameter controls what suggestion results are returned. |
- // This implementation returns the empty string. |
- virtual std::string GetSuggestRequestIdentifier() const; |
- |
- // Returns a string indicating whether a non-default theme is active, |
- // suitable for adding as a query string param to the homepage. This only |
- // applies if Instant Extended is enabled. Returns an empty string otherwise. |
- // Determining this requires accessing the Profile, so this can only ever be |
- // non-empty for UIThreadSearchTermsData. |
- virtual std::string NTPIsThemedParam() const; |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(SearchTermsData); |
-}; |
- |
// Implementation of SearchTermsData that is only usable on the UI thread. |
class UIThreadSearchTermsData : public SearchTermsData { |
public: |
@@ -89,4 +41,4 @@ class UIThreadSearchTermsData : public SearchTermsData { |
DISALLOW_COPY_AND_ASSIGN(UIThreadSearchTermsData); |
}; |
-#endif // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_ |
+#endif // CHROME_BROWSER_SEARCH_ENGINES_UI_THREAD_SEARCH_TERMS_DATA_H_ |