Index: chrome/browser/ui/app_list/search/webstore/webstore_provider.h |
diff --git a/chrome/browser/ui/app_list/search/webstore_provider.h b/chrome/browser/ui/app_list/search/webstore/webstore_provider.h |
similarity index 64% |
rename from chrome/browser/ui/app_list/search/webstore_provider.h |
rename to chrome/browser/ui/app_list/search/webstore/webstore_provider.h |
index aa6e8d43c9028e15cea1efc76e294452953aae04..631298da8a0e9b3dd02cf78cf6d1accfcc42e803 100644 |
--- a/chrome/browser/ui/app_list/search/webstore_provider.h |
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.h |
@@ -2,19 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_PROVIDER_H_ |
-#define CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_PROVIDER_H_ |
+#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_WEBSTORE_PROVIDER_H_ |
+#define CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_WEBSTORE_PROVIDER_H_ |
#include "base/basictypes.h" |
-#include "base/callback.h" |
+#include "base/callback_forward.h" |
#include "base/memory/scoped_ptr.h" |
-#include "base/time/time.h" |
-#include "base/timer/timer.h" |
-#include "chrome/browser/ui/app_list/search/search_provider.h" |
-#include "chrome/browser/ui/app_list/search/webstore_cache.h" |
+#include "chrome/browser/ui/app_list/search/common/webservice_search_provider.h" |
+#include "chrome/browser/ui/app_list/search/webstore/webstore_cache.h" |
class AppListControllerDelegate; |
-class Profile; |
namespace base { |
class DictionaryValue; |
@@ -27,12 +24,12 @@ class WebstoreProviderTest; |
} |
class ChromeSearchResult; |
-class WebstoreSearchFetcher; |
+class JSONResponseFetcher; |
// WebstoreProvider fetches search results from the web store server. |
// A "Search in web store" result will be returned if the server does not |
// return any results. |
-class WebstoreProvider : public SearchProvider { |
+class WebstoreProvider : public WebserviceSearchProvider{ |
public: |
WebstoreProvider(Profile* profile, AppListControllerDelegate* controller); |
virtual ~WebstoreProvider(); |
@@ -56,32 +53,20 @@ class WebstoreProvider : public SearchProvider { |
webstore_search_fetched_callback_ = callback; |
} |
- void set_use_throttling(bool use) { use_throttling_ = use; } |
- |
- Profile* profile_; |
AppListControllerDelegate* controller_; |
- scoped_ptr<WebstoreSearchFetcher> webstore_search_; |
+ scoped_ptr<JSONResponseFetcher> webstore_search_; |
base::Closure webstore_search_fetched_callback_; |
// The cache of the search result which will be valid only in a single |
// input session. |
WebstoreCache cache_; |
- // The timestamp when the last key event happened. |
- base::Time last_keytyped_; |
- |
- // The timer to throttle QPS to the webstore search . |
- base::OneShotTimer<WebstoreProvider> query_throttler_; |
- |
// The current query. |
std::string query_; |
- // The flag for tests. It prevents the throttling If set to false. |
- bool use_throttling_; |
- |
DISALLOW_COPY_AND_ASSIGN(WebstoreProvider); |
}; |
} // namespace app_list |
-#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_PROVIDER_H_ |
+#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_WEBSTORE_WEBSTORE_PROVIDER_H_ |