Reload Instant NTP and Instant-process tabs on search url change

chrome/browser/ui/search/instant_ntp_prerenderer.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
+#include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/ui/search/instant_page.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/network_change_notifier.h"
 
-class InstantExtendedTest;
 class InstantNTP;
 class InstantService;
-class InstantTestBase;
 class Profile;
 
 // InstantNTPPrerenderer maintains a prerendered instance of InstantNTP.
 //
 // An InstantNTP instance is a preloaded search page that will be swapped-in the
 // next time when the user navigates to the New Tab Page. It is never shown to
 // the user in an uncommitted state. It is backed by a WebContents and that is
 // owned by InstantNTP.
 //
 // InstantNTPPrerenderer is owned by InstantService.
 class InstantNTPPrerenderer
     : public InstantPage::Delegate,
-      public net::NetworkChangeNotifier::NetworkChangeObserver {
+      public net::NetworkChangeNotifier::NetworkChangeObserver,
+      public InstantServiceObserver {
  public:
   InstantNTPPrerenderer(Profile* profile, PrefService* prefs);
   virtual ~InstantNTPPrerenderer();
 
   // Preloads |ntp_| with a new InstantNTP.
-  void PreloadInstantNTP();
+  void ReloadInstantNTP();
 
   // Releases and returns the InstantNTP WebContents. May be NULL. Loads a new
   // WebContents for the InstantNTP.
   scoped_ptr<content::WebContents> ReleaseNTPContents() WARN_UNUSED_RESULT;
 
   // The NTP WebContents. May be NULL. InstantNTPPrerenderer retains ownership.
   content::WebContents* GetNTPContents() const;
 
   // Invoked to null out |ntp_|.
   void DeleteNTPContents();
@@ skipping 78 matching lines @@
   virtual void NavigateToURL(const content::WebContents* contents,
                              const GURL& url,
                              content::PageTransition transition,
                              WindowOpenDisposition disposition,
                              bool is_search_type) OVERRIDE;
   virtual void DeleteMostVisitedItem(const GURL& url) OVERRIDE;
   virtual void UndoMostVisitedDeletion(const GURL& url) OVERRIDE;
   virtual void UndoAllMostVisitedDeletions() OVERRIDE;
   virtual void InstantPageLoadFailed(content::WebContents* contents) OVERRIDE;
 
+  // Overridden from InstantServiceObserver:
   // Called when the default search provider changes. Resets InstantNTP.

[samarth, 2013/08/02 21:51:15]

nit: just delete this line

[Anuj, 2013/08/09 07:22:00]

Done.

-  void OnDefaultSearchProviderChanged(const std::string& pref_name);
+  virtual void DefaultSearchProviderChanged() OVERRIDE;
+  virtual void GoogleURLUpdated() OVERRIDE;
 
   // Recreates |ntp_| using |instant_url|.
   void ResetNTP(const std::string& instant_url);
 
-  // Resets |ntp_| with a new InstantNTP. Called when |ntp_| is stale or when a
-  // pref is changed.
-  void ReloadStaleNTP();
-
   // Returns true if |ntp_| has an up-to-date Instant URL and supports Instant.
   // Note that local URLs will not pass this check.
   bool PageIsCurrent() const;
 
   // Returns true if we should switch to using the local NTP.
   bool ShouldSwitchToLocalNTP() const;
 
   Profile* profile_;
 
   // Whether the extended API is enabled.
   const bool extended_enabled_;
 
   // Preloaded InstantNTP.
   scoped_ptr<InstantNTP> ntp_;
 
   PrefChangeRegistrar profile_pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantNTPPrerenderer);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_PRERENDERER_H_