Merge 68816 - Fixes bug where we would show an instant preview when we though...

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"
@@ skipping 49 matching lines @@
 
   // Releases the preview TabContents passing ownership to the caller. This is
   // intended to be called when the preview TabContents is committed. This does
   // not notify the delegate.
   TabContentsWrapper* 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.
   TabContentsWrapper* preview_contents() const {
     return preview_contents_.get();
   }
 
   // Returns true if the preview TabContents is ready to be shown.
@@ skipping 50 matching lines @@
   // Invoked from the timer to update the bounds of the omnibox.
   void ProcessBoundsChange();
 
   // Creates and sets the preview TabContentsWrapper.
   void CreatePreviewContents(TabContentsWrapper* tab_contents);
 
   InstantLoaderDelegate* delegate_;
 
   // If we're showing instant results this is the ID of the TemplateURL driving
   // the results. A value of 0 means there is no TemplateURL.
-  TemplateURLID template_url_id_;
+  const TemplateURLID template_url_id_;
 
   // The url we're displaying.
   GURL url_;
 
-  // The URL first used to load instant results.
-  GURL initial_instant_url_;
-
   // Delegate of the preview TabContents. Used to detect when the user does some
   // gesture on the TabContents and the preview needs to be activated.
   scoped_ptr<TabContentsDelegateImpl> preview_tab_contents_delegate_;
 
   // The preview TabContents; may be null.
   scoped_ptr<TabContentsWrapper> preview_contents_;
 
   // Is the preview_contents ready to be shown?
   bool ready_;
 
@@ skipping 23 matching lines @@
   // Used to get notifications about renderers coming and going.
   NotificationRegistrar registrar_;
 
   // Last value of verbatim passed to |Update|.
   bool verbatim_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_