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

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

Issue 12001002: InstantExtended: Transient naventry for preview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 10 months 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 | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 1a08425b39423b7f64eba611099f18fa94b632fc..c9cae091480cc0269cbd6319f19ab5a5d8677671 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -40,6 +40,7 @@ class BrowserInstantController;
}
namespace content {
+class NavigationEntry;
class WebContents;
}
@@ -264,6 +265,19 @@ class InstantController : public InstantPage::Delegate {
int height,
InstantSizeUnits units);
+ // Copies the loader's active NavigationEntry into a transient history entry
+ // for the 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();
+
+ // Updates the URL in the transient history entry for the overlay.
+ void UpdateTransientHistoryEntry(const GURL& url);
+
+ // Discards any transient history entry set by Instant.
+ // See SetTransientHistoryEntry().
+ void ResetTransientHistoryEntry();
+
// Send the omnibox popup bounds to the page.
void SendPopupBoundsToPage();
@@ -391,6 +405,9 @@ class InstantController : public InstantPage::Delegate {
// List of events and their timestamps, useful in debugging Instant behaviour.
mutable std::list<std::pair<int64, std::string> > debug_events_;
+ // True iff Instant has set a transient history entry for the active tab.
+ bool instant_set_transient_entry_;
+
DISALLOW_COPY_AND_ASSIGN(InstantController);
};
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698