OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SEARCH_INSTANT_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ |
6 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ | 6 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 private: | 105 private: |
106 friend class InstantExtendedTest; | 106 friend class InstantExtendedTest; |
107 friend class InstantTestBase; | 107 friend class InstantTestBase; |
108 | 108 |
109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest, | 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest, |
110 NTPReactsToNetworkChanges); | 110 NTPReactsToNetworkChanges); |
111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, | 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, |
112 MANUAL_ShowsGoogleNTP); | 112 MANUAL_ShowsGoogleNTP); |
113 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, | 113 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, |
114 MANUAL_SearchesFromFakebox); | 114 MANUAL_SearchesFromFakebox); |
| 115 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
115 | 116 |
116 // Overridden from BrowserContextKeyedService: | 117 // Overridden from BrowserContextKeyedService: |
117 virtual void Shutdown() OVERRIDE; | 118 virtual void Shutdown() OVERRIDE; |
118 | 119 |
119 // Overridden from content::NotificationObserver: | 120 // Overridden from content::NotificationObserver: |
120 virtual void Observe(int type, | 121 virtual void Observe(int type, |
121 const content::NotificationSource& source, | 122 const content::NotificationSource& source, |
122 const content::NotificationDetails& details) OVERRIDE; | 123 const content::NotificationDetails& details) OVERRIDE; |
123 | 124 |
124 // Called when we get new most visited items from TopSites, registered as an | 125 // Called when we get new most visited items from TopSites, registered as an |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 // created for OTR browser windows). Used to preload and delete InstantNTP. | 159 // created for OTR browser windows). Used to preload and delete InstantNTP. |
159 size_t browser_instant_controller_object_count_; | 160 size_t browser_instant_controller_object_count_; |
160 | 161 |
161 // Used for Top Sites async retrieval. | 162 // Used for Top Sites async retrieval. |
162 base::WeakPtrFactory<InstantService> weak_ptr_factory_; | 163 base::WeakPtrFactory<InstantService> weak_ptr_factory_; |
163 | 164 |
164 DISALLOW_COPY_AND_ASSIGN(InstantService); | 165 DISALLOW_COPY_AND_ASSIGN(InstantService); |
165 }; | 166 }; |
166 | 167 |
167 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ | 168 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ |
OLD | NEW |