chrome/browser/automation/testing_automation_provider.cc - Issue 8298005: Fixes bug in instant where we would end up incorrectly using the

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/automation/testing_automation_provider.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:

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index 2237ffa15844e82c3518991b75d74992a13d2ff4..ac2e654e0c272f2441154836b212bda54d5fe25d 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -3536,7 +3536,8 @@ void TestingAutomationProvider::GetInstantInfo(Browser* browser,

InstantController* instant = browser->instant();

info->SetBoolean("enabled", true);

info->SetBoolean("showing", instant->is_displayable());

- info->SetBoolean("active", instant->is_active());

+ // TODO: can we remove this?

+ info->SetBoolean("active", (instant->GetPreviewContents() != NULL));

info->SetBoolean("current", instant->IsCurrent());

if (instant->GetPreviewContents() &&

instant->GetPreviewContents()->tab_contents()) {