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

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: Save old transient entry; update URL. Created 7 years, 11 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
Index: chrome/browser/instant/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 250c31a6c0d10fb64a05141f033f20517b98aff2..397af0d70c523e277443db28f8a8572e255f036b 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;
}
@@ -222,6 +223,14 @@ class InstantController {
int height,
InstantSizeUnits units);
+ // Copies the loader's 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();
+
+ // Restores the old transient entry for the active tab, if any.
+ void ResetTransientHistoryEntry();
+
// Send the omnibox popup bounds to the page.
void SendPopupBoundsToPage();
@@ -324,6 +333,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);
};
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | chrome/browser/instant/instant_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698