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

Unified Diff: chrome/browser/ui/browser.cc

Issue 8298005: Fixes bug in instant where we would end up incorrectly using the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweak Created 9 years, 2 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 | « chrome/browser/instant/instant_delegate.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e1b9c58f35c53810d28882f502a2d578e9c4d3d9..ad0099a58e0c639ab6badca8a949ed8530411fcb 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3165,7 +3165,7 @@ void Browser::TabDeactivated(TabContentsWrapper* contents) {
if (contents == fullscreened_tab_)
ExitTabbedFullscreenModeIfNecessary();
if (instant())
- instant()->DestroyPreviewContentsAndLeaveActive();
+ instant()->Hide();
// Save what the user's currently typing, so it can be restored when we
// switch back to this tab.
@@ -4154,7 +4154,7 @@ void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
}
void Browser::HideInstant() {
- window_->HideInstant(instant_->is_active());
+ window_->HideInstant();
}
void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
@@ -5102,7 +5102,7 @@ TabContentsWrapper* Browser::TabContentsFactory(
}
bool Browser::OpenInstant(WindowOpenDisposition disposition) {
- if (!instant() || !instant()->is_active() || !instant()->PrepareForCommit() ||
+ if (!instant() || !instant()->PrepareForCommit() ||
disposition == NEW_BACKGROUND_TAB) {
// NEW_BACKGROUND_TAB results in leaving the omnibox open, so we don't
// attempt to use the instant preview.
« no previous file with comments | « chrome/browser/instant/instant_delegate.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698