Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f…

chrome/browser/instant/instant_loader.h

 // Copyright (c) 2012 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_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 class Rect;
 }
 
 // InstantLoader is created with an "Instant URL". It loads the URL and tells
 // its delegate (usually InstantController) of all interesting events. For
 // example, it determines if the page actually supports the Instant API
 // (http://dev.chromium.org/searchbox) and forwards messages (such as queries
 // and autocomplete suggestions) between the page and the delegate.
 class InstantLoader : public content::NotificationObserver {
  public:
+  // Returns the instant loader for |web_contents| if it's used for instant.

[sreeram, 2012/09/25 22:22:29]

instant -> Instant, here and elsewhere in this change.

+  static InstantLoader* FromWebContents(content::WebContents* web_contents);
+
   // Creates a new empty WebContents. Use Init() to actually load |instant_url|.
   // |tab_contents| is the page the preview will be shown on top of and
   // potentially replace. |instant_url| is typically the instant_url field of
   // the default search engine's TemplateURL, with the "{searchTerms}" parameter
   // replaced with an empty string.
   InstantLoader(InstantLoaderDelegate* delegate,
                 const std::string& instant_url,
                 const TabContents* tab_contents);
   virtual ~InstantLoader();
 
@@ skipping 12 matching lines @@
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
   // Tells the preview page about the available autocomplete results.
   void SendAutocompleteResults(
       const std::vector<InstantAutocompleteResult>& results);
 
   // Tells the preview page that the user pressed the up or down key. |count|
   // is a repeat count, negative for moving up, positive for moving down.
   void OnUpOrDownKeyPressed(int count);
 
+  // Called by the history tab helper with the information that it would have
+  // added to the history service had this web contents not been used for
+  // instant.
+  void DidNavigate(const history::HistoryAddPageArgs& add_page_args);
+
   // Releases the preview TabContents passing ownership to the caller. This
   // should be called when the preview is committed. Notifies the page but not
   // the delegate. |text| is the final omnibox text being committed. NOTE: The
   // caller should destroy this loader object right after this method, since
   // none of the other methods will work once the preview has been released.
   TabContents* ReleasePreviewContents(InstantCommitType type,
                                       const string16& text) WARN_UNUSED_RESULT;
 
   // The preview TabContents. The loader retains ownership. This will be
   // non-NULL until ReleasePreviewContents() is called.
@@ skipping 17 matching lines @@
   // Returns true if the mouse or a touch pointer is down due to activating the
   // preview content.
   bool IsPointerDownFromActivate() const;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+  static int kUserDataKey;

[sreeram, 2012/09/25 22:22:29]

It seems like you can stash this in the .cc file (in an anonymous namespace)
without exposing it here at all.

[jam, 2012/09/25 22:42:39]

Done.

   class WebContentsDelegateImpl;
 
   void SetupPreviewContents();
   void CleanupPreviewContents();
   void ReplacePreviewContents(content::WebContents* old_contents,
                               content::WebContents* new_contents);
 
   InstantLoaderDelegate* const loader_delegate_;
 
   // See comments on the getter above.
@@ skipping 12 matching lines @@
   // Used to get notifications about renderers coming and going.
   content::NotificationRegistrar registrar_;
 
   // See comments on the getter above.
   history::HistoryAddPageArgs last_navigation_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_