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

Unified Diff: chrome/browser/instant/instant_loader.h

Issue 5771001: Fixes bug where we would show an instant preview when we thought the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.h
diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h
index 412a52232a8598be650b41a8e3508e4b429032dd..bae1a89a99b904fc2ba144f0c70d083540d33aaa 100644
--- a/chrome/browser/instant/instant_loader.h
+++ b/chrome/browser/instant/instant_loader.h
@@ -67,10 +67,6 @@ class InstantLoader : public NotificationObserver {
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);
@@ -141,14 +137,11 @@ class InstantLoader : public NotificationObserver {
// 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_;
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698