content/browser/accessibility/accessibility_ui.cc - Issue 25654005: Remove GetActiveEntry usage from content.

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: content/browser/accessibility/accessibility_ui.cc

Issue 25654005: Remove GetActiveEntry usage from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove GetWebkitPrefs() change. Created 7 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: content/browser/accessibility/accessibility_ui.cc

diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc

index d5a9734b0eb28177f8f70faf04cddfa372647069..7808cc1c5ffc76eb3aa14162ecda815ed66807a4 100644

--- a/content/browser/accessibility/accessibility_ui.cc

+++ b/content/browser/accessibility/accessibility_ui.cc

@@ -72,10 +72,12 @@ base::DictionaryValue* BuildTargetDescriptor(RenderViewHost* rvh) {

GURL url;

GURL favicon_url;

if (web_contents) {

+ // TODO(nasko): Fix the following code to use a consistent set of data

+ // across the URL, title, and favicon.

url = web_contents->GetURL();

title = UTF16ToUTF8(web_contents->GetTitle());

NavigationController& controller = web_contents->GetController();

- NavigationEntry* entry = controller.GetActiveEntry();

+ NavigationEntry* entry = controller.GetVisibleEntry();

if (entry != NULL && entry->GetURL().is_valid())

favicon_url = entry->GetFavicon().url;

}