chrome/browser/ui/omnibox/omnibox_popup_model.cc - Issue 19197005: Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion|

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/ui/omnibox/omnibox_popup_model.cc

Issue 19197005: Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion| (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: drop user_text() in omnibox_edit_model Created 7 years, 5 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/ui/omnibox/omnibox_popup_model.cc

diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc

index 30d182594917a0c39097708ab91faa4d49d05fbe..f7b1135fdc044d8909aa832eff4e1fa9fbb3e198 100644

--- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc

+++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc

@@ -111,13 +111,7 @@ void OmniboxPopupModel::SetSelectedLine(size_t line,

match.GetKeywordUIState(edit_model_->profile(), &keyword, &is_keyword_hint);

if (reset_to_default) {

- string16 inline_autocomplete_text;

- if ((match.inline_autocomplete_offset != string16::npos) &&

- (match.inline_autocomplete_offset < match.fill_into_edit.length())) {

- inline_autocomplete_text =

- match.fill_into_edit.substr(match.inline_autocomplete_offset);

- }

- edit_model_->OnPopupDataChanged(inline_autocomplete_text, NULL,

+ edit_model_->OnPopupDataChanged(match.inline_autocompletion, NULL,

keyword, is_keyword_hint);

} else {

edit_model_->OnPopupDataChanged(match.fill_into_edit, &current_destination,

« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_edit_model.cc ('k') | chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc » ('j') | no next file with comments »