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

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

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Last test fix? Created 6 years, 7 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 | Annotate | Revision Log
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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "base/prefs/pref_change_registrar.h"
19 #include "chrome/browser/google/google_url_tracker.h" 18 #include "chrome/browser/google/google_url_tracker.h"
20 #include "chrome/browser/history/history_types.h" 19 #include "chrome/browser/history/history_types.h"
20 #include "chrome/browser/search_engines/template_url_service_observer.h"
21 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 21 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
22 #include "chrome/common/instant_types.h" 22 #include "chrome/common/instant_types.h"
23 #include "components/keyed_service/core/keyed_service.h" 23 #include "components/keyed_service/core/keyed_service.h"
24 #include "content/public/browser/notification_observer.h" 24 #include "content/public/browser/notification_observer.h"
25 #include "content/public/browser/notification_registrar.h" 25 #include "content/public/browser/notification_registrar.h"
26 #include "url/gurl.h"
26 27
27 class GURL;
28 class InstantIOContext; 28 class InstantIOContext;
29 class InstantServiceObserver; 29 class InstantServiceObserver;
30 class InstantTestBase; 30 class InstantTestBase;
31 class InstantServiceTest; 31 class InstantServiceTest;
32 class Profile; 32 class Profile;
33 class ThemeService; 33 class ThemeService;
34 34
35 namespace content { 35 namespace content {
36 class RenderProcessHost; 36 class RenderProcessHost;
37 } 37 }
38 38
39 namespace net { 39 namespace net {
40 class URLRequest; 40 class URLRequest;
41 } 41 }
42 42
43 // Tracks render process host IDs that are associated with Instant. 43 // Tracks render process host IDs that are associated with Instant.
44 class InstantService : public KeyedService, 44 class InstantService : public KeyedService,
45 public content::NotificationObserver { 45 public content::NotificationObserver,
46 public TemplateURLServiceObserver {
46 public: 47 public:
47 explicit InstantService(Profile* profile); 48 explicit InstantService(Profile* profile);
48 virtual ~InstantService(); 49 virtual ~InstantService();
49 50
50 // Add, remove, and query RenderProcessHost IDs that are associated with 51 // Add, remove, and query RenderProcessHost IDs that are associated with
51 // Instant processes. 52 // Instant processes.
52 void AddInstantProcess(int process_id); 53 void AddInstantProcess(int process_id);
53 bool IsInstantProcess(int process_id) const; 54 bool IsInstantProcess(int process_id) const;
54 55
55 // Adds/Removes InstantService observers. 56 // Adds/Removes InstantService observers.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 102
102 private: 103 private:
103 friend class InstantExtendedTest; 104 friend class InstantExtendedTest;
104 friend class InstantServiceTest; 105 friend class InstantServiceTest;
105 friend class InstantTestBase; 106 friend class InstantTestBase;
106 friend class InstantUnitTestBase; 107 friend class InstantUnitTestBase;
107 108
108 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest, 109 FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
109 MANUAL_SearchesFromFakebox); 110 MANUAL_SearchesFromFakebox);
110 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); 111 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
111 FRIEND_TEST_ALL_PREFIXES(InstantServiceTest, SendsSearchURLsToRenderer); 112 FRIEND_TEST_ALL_PREFIXES(InstantServiceEnabledTest,
113 SendsSearchURLsToRenderer);
112 114
113 // Overridden from KeyedService: 115 // Overridden from KeyedService:
114 virtual void Shutdown() OVERRIDE; 116 virtual void Shutdown() OVERRIDE;
115 117
116 // Overridden from content::NotificationObserver: 118 // Overridden from content::NotificationObserver:
117 virtual void Observe(int type, 119 virtual void Observe(int type,
118 const content::NotificationSource& source, 120 const content::NotificationSource& source,
119 const content::NotificationDetails& details) OVERRIDE; 121 const content::NotificationDetails& details) OVERRIDE;
120 122
123 // Overridden from TemplateURLServiceObserver:
124 virtual void OnTemplateURLServiceChanged() OVERRIDE;
125
126
121 // Called when a renderer process is terminated. 127 // Called when a renderer process is terminated.
122 void OnRendererProcessTerminated(int process_id); 128 void OnRendererProcessTerminated(int process_id);
123 129
124 // Called when we get new most visited items from TopSites, registered as an 130 // Called when we get new most visited items from TopSites, registered as an
125 // async callback. Parses them and sends them to the renderer via 131 // async callback. Parses them and sends them to the renderer via
126 // SendMostVisitedItems. 132 // SendMostVisitedItems.
127 void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data); 133 void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data);
128 134
129 // Notifies the observer about the last known most visited items. 135 // Notifies the observer about the last known most visited items.
130 void NotifyAboutMostVisitedItems(); 136 void NotifyAboutMostVisitedItems();
131 137
132 // Theme changed notification handler. 138 // Theme changed notification handler.
133 void OnThemeChanged(ThemeService* theme_service); 139 void OnThemeChanged(ThemeService* theme_service);
134 140
135 void OnGoogleURLUpdated(Profile* profile, 141 void OnGoogleURLUpdated(Profile* profile,
136 GoogleURLTracker::UpdatedDetails* details); 142 GoogleURLTracker::UpdatedDetails* details);
137 143
138 void OnDefaultSearchProviderChanged(const std::string& pref_name);
139
140 void ResetInstantSearchPrerenderer(); 144 void ResetInstantSearchPrerenderer();
141 145
142 Profile* const profile_; 146 Profile* const profile_;
143 147
144 // The process ids associated with Instant processes. 148 // The process ids associated with Instant processes.
145 std::set<int> process_ids_; 149 std::set<int> process_ids_;
146 150
147 // InstantMostVisitedItems sent to the Instant Pages. 151 // InstantMostVisitedItems sent to the Instant Pages.
148 std::vector<InstantMostVisitedItem> most_visited_items_; 152 std::vector<InstantMostVisitedItem> most_visited_items_;
149 153
150 // Theme-related data for NTP overlay to adopt themes. 154 // Theme-related data for NTP overlay to adopt themes.
151 scoped_ptr<ThemeBackgroundInfo> theme_info_; 155 scoped_ptr<ThemeBackgroundInfo> theme_info_;
152 156
153 // The start-edge margin of the omnibox, used by the Instant page to align 157 // The start-edge margin of the omnibox, used by the Instant page to align
154 // text or assets properly with the omnibox. 158 // text or assets properly with the omnibox.
155 int omnibox_start_margin_; 159 int omnibox_start_margin_;
156 160
157 ObserverList<InstantServiceObserver> observers_; 161 ObserverList<InstantServiceObserver> observers_;
158 162
159 content::NotificationRegistrar registrar_; 163 content::NotificationRegistrar registrar_;
160 164
161 PrefChangeRegistrar profile_pref_registrar_;
162
163 scoped_refptr<InstantIOContext> instant_io_context_; 165 scoped_refptr<InstantIOContext> instant_io_context_;
164 166
165 // Set to NULL if the default search provider does not support Instant. 167 // Set to NULL if the default search provider does not support Instant.
166 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_; 168 scoped_ptr<InstantSearchPrerenderer> instant_prerenderer_;
167 169
168 // Used for Top Sites async retrieval. 170 // Used for Top Sites async retrieval.
169 base::WeakPtrFactory<InstantService> weak_ptr_factory_; 171 base::WeakPtrFactory<InstantService> weak_ptr_factory_;
170 172
173 // Used to avoid resetting the instant_prerenderer_ if an unrelated change to
174 // the TemplateURLService occurs.
175 GURL current_search_result_prefetch_base_url_;
176
171 DISALLOW_COPY_AND_ASSIGN(InstantService); 177 DISALLOW_COPY_AND_ASSIGN(InstantService);
172 }; 178 };
173 179
174 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ 180 #endif // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698