OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ |
6 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ | 6 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ |
7 | 7 |
8 #include "base/android/jni_helper.h" | 8 #include "base/android/jni_helper.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/synchronization/waitable_event.h" | 11 #include "base/synchronization/waitable_event.h" |
| 12 #include "base/task/cancelable_task_tracker.h" |
12 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" | 13 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" |
13 #include "chrome/browser/common/cancelable_request.h" | 14 #include "chrome/browser/common/cancelable_request.h" |
14 #include "chrome/browser/history/android/android_history_types.h" | 15 #include "chrome/browser/history/android/android_history_types.h" |
15 #include "chrome/common/cancelable_task_tracker.h" | |
16 #include "content/public/browser/notification_observer.h" | 16 #include "content/public/browser/notification_observer.h" |
17 #include "content/public/browser/notification_registrar.h" | 17 #include "content/public/browser/notification_registrar.h" |
18 | 18 |
19 class AndroidHistoryProviderService; | 19 class AndroidHistoryProviderService; |
20 class FaviconService; | 20 class FaviconService; |
21 class Profile; | 21 class Profile; |
22 | 22 |
23 namespace history { | 23 namespace history { |
24 class TopSites; | 24 class TopSites; |
25 } | 25 } |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 scoped_ptr<FaviconService> favicon_service_; | 194 scoped_ptr<FaviconService> favicon_service_; |
195 | 195 |
196 // Different cancelable request consumers must be used for each service. | 196 // Different cancelable request consumers must be used for each service. |
197 // This because a synchronization issue that could lead to flaky assertion | 197 // This because a synchronization issue that could lead to flaky assertion |
198 // failures otherwise. | 198 // failures otherwise. |
199 // TODO(leandrogracia): use a single consumer once http://crbug.com/85970 | 199 // TODO(leandrogracia): use a single consumer once http://crbug.com/85970 |
200 // is fixed. | 200 // is fixed. |
201 CancelableRequestConsumer android_history_consumer_; | 201 CancelableRequestConsumer android_history_consumer_; |
202 CancelableRequestConsumer favicon_consumer_; | 202 CancelableRequestConsumer favicon_consumer_; |
203 | 203 |
204 CancelableTaskTracker cancelable_task_tracker_; | 204 base::CancelableTaskTracker cancelable_task_tracker_; |
205 | 205 |
206 // Used to register/unregister notification observer. | 206 // Used to register/unregister notification observer. |
207 content::NotificationRegistrar notification_registrar_; | 207 content::NotificationRegistrar notification_registrar_; |
208 | 208 |
209 bool handling_extensive_changes_; | 209 bool handling_extensive_changes_; |
210 | 210 |
211 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider); | 211 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider); |
212 }; | 212 }; |
213 | 213 |
214 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ | 214 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ |
OLD | NEW |