Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Side by Side Diff: chrome/browser/search/instant_service.h

Issue 1543203002: Remove a variety of no-longer-used query params. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // necessary. Investigate more and remove this from here. 80 // necessary. Investigate more and remove this from here.
81 void UpdateThemeInfo(); 81 void UpdateThemeInfo();
82 82
83 // Invoked by the InstantController to update most visited items details for 83 // Invoked by the InstantController to update most visited items details for
84 // NTP. 84 // NTP.
85 void UpdateMostVisitedItemsInfo(); 85 void UpdateMostVisitedItemsInfo();
86 86
87 // Sends the current set of search URLs to a renderer process. 87 // Sends the current set of search URLs to a renderer process.
88 void SendSearchURLsToRenderer(content::RenderProcessHost* rph); 88 void SendSearchURLsToRenderer(content::RenderProcessHost* rph);
89 89
90 // Invoked to notify the Instant page that the omnibox start margin has
91 // changed.
92 void OnOmniboxStartMarginChanged(int start_margin);
93
94 InstantSearchPrerenderer* instant_search_prerenderer() { 90 InstantSearchPrerenderer* instant_search_prerenderer() {
95 return instant_prerenderer_.get(); 91 return instant_prerenderer_.get();
96 } 92 }
97 93
98 int omnibox_start_margin() const { return omnibox_start_margin_; }
99
100 private: 94 private:
101 friend class InstantExtendedTest; 95 friend class InstantExtendedTest;
102 friend class InstantServiceTest; 96 friend class InstantServiceTest;
103 friend class InstantTestBase; 97 friend class InstantTestBase;
104 friend class InstantUnitTestBase; 98 friend class InstantUnitTestBase;
105 99
106 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, 100 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
107 MANUAL_SearchesFromFakebox); 101 MANUAL_SearchesFromFakebox);
108 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); 102 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
109 FRIEND_TEST_ALL_PREFIXES(InstantServiceEnabledTest, 103 FRIEND_TEST_ALL_PREFIXES(InstantServiceEnabledTest,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 156
163 // InstantMostVisitedItems from TopSites. 157 // InstantMostVisitedItems from TopSites.
164 std::vector<InstantMostVisitedItem> most_visited_items_; 158 std::vector<InstantMostVisitedItem> most_visited_items_;
165 159
166 // InstantMostVisitedItems from SuggestionService. 160 // InstantMostVisitedItems from SuggestionService.
167 std::vector<InstantMostVisitedItem> suggestions_items_; 161 std::vector<InstantMostVisitedItem> suggestions_items_;
168 162
169 // Theme-related data for NTP overlay to adopt themes. 163 // Theme-related data for NTP overlay to adopt themes.
170 scoped_ptr<ThemeBackgroundInfo> theme_info_; 164 scoped_ptr<ThemeBackgroundInfo> theme_info_;
171 165
172 // The start-edge margin of the omnibox, used by the Instant page to align
173 // text or assets properly with the omnibox.
174 int omnibox_start_margin_;
175
176 base::ObserverList<InstantServiceObserver> observers_; 166 base::ObserverList<InstantServiceObserver> observers_;
177 167
178 content::NotificationRegistrar registrar_; 168 content::NotificationRegistrar registrar_;
179 169
180 scoped_refptr<InstantIOContext> instant_io_context_; 170 scoped_refptr<InstantIOContext> instant_io_context_;
181 171
182 // Set to NULL if the default search provider does not support Instant. 172 // Set to NULL if the default search provider does not support Instant.
183 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_; 173 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_;
184 174
185 // Used to check whether notifications from TemplateURLService indicate a 175 // Used to check whether notifications from TemplateURLService indicate a
186 // change that affects the default search provider. 176 // change that affects the default search provider.
187 scoped_ptr<TemplateURLData> previous_default_search_provider_; 177 scoped_ptr<TemplateURLData> previous_default_search_provider_;
188 GURL previous_google_base_url_; 178 GURL previous_google_base_url_;
189 179
190 // Suggestions Service to fetch server suggestions. 180 // Suggestions Service to fetch server suggestions.
191 suggestions::SuggestionsService* suggestions_service_; 181 suggestions::SuggestionsService* suggestions_service_;
192 182
193 // Used for Top Sites async retrieval. 183 // Used for Top Sites async retrieval.
194 base::WeakPtrFactory<InstantService> weak_ptr_factory_; 184 base::WeakPtrFactory<InstantService> weak_ptr_factory_;
195 185
196 DISALLOW_COPY_AND_ASSIGN(InstantService); 186 DISALLOW_COPY_AND_ASSIGN(InstantService);
197 }; 187 };
198 188
199 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ 189 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/search/instant_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698