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

Unified Diff: chrome/browser/search/instant_service.h

Issue 20388003: Reload Instant NTP and Instant-process tabs on search url change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed InstantNTPPrerendererTest Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/search/instant_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/instant_service.h
diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h
index f8c88e504a222d3af035d6fc4fadcd59f56f61ea..f876c4a613a4d90090a091572d9dfad0148bfe6a 100644
--- a/chrome/browser/search/instant_service.h
+++ b/chrome/browser/search/instant_service.h
@@ -17,6 +17,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "base/prefs/pref_change_registrar.h"
+#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/ui/search/instant_ntp_prerenderer.h"
#include "chrome/common/instant_types.h"
@@ -25,10 +27,8 @@
#include "content/public/browser/notification_registrar.h"
class GURL;
-class InstantExtendedTest;
class InstantIOContext;
class InstantServiceObserver;
-class InstantTestBase;
class Profile;
class ThemeService;
@@ -104,7 +104,9 @@ class InstantService : public BrowserContextKeyedService,
private:
friend class InstantExtendedTest;
+ friend class InstantServiceTest;
friend class InstantTestBase;
+ friend class InstantUnitTestBase;
FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest,
NTPReactsToNetworkChanges);
@@ -133,6 +135,11 @@ class InstantService : public BrowserContextKeyedService,
// Theme changed notification handler.
void OnThemeChanged(ThemeService* theme_service);
+ void OnGoogleURLUpdated(Profile* profile,
+ GoogleURLTracker::UpdatedDetails* details);
+
+ void OnDefaultSearchProviderChanged(const std::string& pref_name);
+
// Used by tests.
InstantNTPPrerenderer* ntp_prerenderer();
@@ -151,6 +158,8 @@ class InstantService : public BrowserContextKeyedService,
content::NotificationRegistrar registrar_;
+ PrefChangeRegistrar profile_pref_registrar_;
+
scoped_refptr<InstantIOContext> instant_io_context_;
InstantNTPPrerenderer ntp_prerenderer_;
« no previous file with comments | « no previous file | chrome/browser/search/instant_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698