Modifies the Instant loader to listen for RENDER_VIEW_HOST_CHANGED notificati...

chrome/browser/instant/instant_loader.h

 // Copyright (c) 2010 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_INSTANT_INSTANT_LOADER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/search_engines/template_url_id.h"
+#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_transition_types.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 class InstantLoaderDelegate;
 class InstantLoaderManagerTest;
 class TabContents;
 class TemplateURL;
 
 // InstantLoader does the loading of a particular URL for InstantController.
 // InstantLoader notifies its delegate, which is typically InstantController, of
 // all interesting events.
 //
 // InstantLoader is created with a TemplateURLID. If non-zero InstantLoader
 // first determines if the site actually supports instant. If it doesn't, the
 // delegate is notified by way of |InstantLoaderDoesntSupportInstant|.
 //
 // If the TemplateURLID supplied to the constructor is zero, then the url is
 // loaded as is.
-class InstantLoader {
+class InstantLoader : public NotificationObserver {
  public:
   InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id);
-  ~InstantLoader();
+  virtual ~InstantLoader();
 
   // Invoked to load a URL. |tab_contents| is the TabContents the preview is
   // going to be shown on top of and potentially replace.
   void Update(TabContents* tab_contents,
               const TemplateURL* template_url,
               const GURL& url,
               PageTransition::Type transition_type,
               const string16& user_text,
               string16* suggested_text);
 
@@ skipping 12 matching lines @@
   TabContents* ReleasePreviewContents(InstantCommitType type);
 
   // Calls through to method of same name on delegate.
   bool ShouldCommitInstantOnMouseUp();
   void CommitInstantLoader();
 
   // Resets the template_url_id_ to zero and shows this loader. This is only
   // intended to be invoked from InstantLoaderDoesntSupportInstant.
   void ClearTemplateURLID();
 
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
   // The preview TabContents; may be null.
   TabContents* preview_contents() const { return preview_contents_.get(); }
 
   // Returns true if the preview TabContents is ready to be shown.
   bool ready() const { return ready_; }
 
   const GURL& url() const { return url_; }
 
   // Are we showing instant results?
   bool is_showing_instant() const { return template_url_id_ != 0; }
@@ skipping 77 matching lines @@
   gfx::Rect last_omnibox_bounds_;
 
   scoped_ptr<FrameLoadObserver> frame_load_observer_;
 
   // Transition type of the match last passed to Update.
   PageTransition::Type last_transition_type_;
 
   // Timer used to update the bounds of the omnibox.
   base::OneShotTimer<InstantLoader> update_bounds_timer_;
 
+  // Used to get notifications about renderers coming and going.
+  NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_