Index: chrome/browser/instant/instant_controller.h |
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h |
index db74de89ada7713558703d7d1b2a35b5a662f7f4..46d43327e75bc6f0692d379b2cddb6faee24c256 100644 |
--- a/chrome/browser/instant/instant_controller.h |
+++ b/chrome/browser/instant/instant_controller.h |
@@ -36,6 +36,7 @@ class BrowserInstantController; |
} |
namespace content { |
+class NavigationEntry; |
class WebContents; |
} |
@@ -225,6 +226,17 @@ class InstantController { |
int height, |
InstantSizeUnits units); |
+ // Copies the loader's NavigationEntry into a transient history entry for the |
sreeram
2013/01/25 18:17:29
loader's NavigationEntry -> loader's active Naviga
Jered
2013/01/25 19:27:18
Done.
|
+ // active tab. Used to update the tab title and make the back button work as |
+ // expected when the preview is shown at full height but not yet committed. |
+ void SetTransientHistoryEntry(); |
+ |
+ // Restores the old transient entry for the active tab, if any. |
+ void ResetTransientHistoryEntry(); |
+ |
+ // Updates the url in the transient history entry for the overlay. |
+ void UpdateTransientHistoryEntry(const GURL& url); |
+ |
// Send the omnibox popup bounds to the page. |
void SendPopupBoundsToPage(); |
@@ -327,6 +339,12 @@ class InstantController { |
// MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. |
bool allow_preview_to_show_search_suggestions_; |
+ // The transient navigation entry associated with the active tab, if any. |
+ scoped_ptr<content::NavigationEntry> transient_entry_; |
+ |
+ // True iff Instant has set a transient history entry for the active tab. |
+ bool instant_set_transient_entry_; |
+ |
DISALLOW_COPY_AND_ASSIGN(InstantController); |
}; |