| Index: chrome/browser/autocomplete/autocomplete_input.cc
|
| diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc
|
| index 0edb4d9fa45d499b0f6671110fcc2e51bd3d8776..8ca7bdf1fb79f38882307cd0fc48d5adbec9db32 100644
|
| --- a/chrome/browser/autocomplete/autocomplete_input.cc
|
| +++ b/chrome/browser/autocomplete/autocomplete_input.cc
|
| @@ -30,7 +30,7 @@ void AdjustCursorPositionIfNecessary(size_t num_leading_chars_removed,
|
|
|
| AutocompleteInput::AutocompleteInput()
|
| : cursor_position_(string16::npos),
|
| - current_page_classification_(AutocompleteInput::INVALID_SPEC),
|
| + omnibox_context_(AutocompleteInput::INVALID_SPEC),
|
| type_(INVALID),
|
| prevent_inline_autocomplete_(false),
|
| prefer_keyword_(false),
|
| @@ -43,14 +43,14 @@ AutocompleteInput::AutocompleteInput(
|
| size_t cursor_position,
|
| const string16& desired_tld,
|
| const GURL& current_url,
|
| - AutocompleteInput::PageClassification current_page_classification,
|
| + AutocompleteInput::OmniboxContext omnibox_context,
|
| bool prevent_inline_autocomplete,
|
| bool prefer_keyword,
|
| bool allow_exact_keyword_match,
|
| MatchesRequested matches_requested)
|
| : cursor_position_(cursor_position),
|
| current_url_(current_url),
|
| - current_page_classification_(current_page_classification),
|
| + omnibox_context_(omnibox_context),
|
| prevent_inline_autocomplete_(prevent_inline_autocomplete),
|
| prefer_keyword_(prefer_keyword),
|
| allow_exact_keyword_match_(allow_exact_keyword_match),
|
| @@ -511,7 +511,7 @@ void AutocompleteInput::Clear() {
|
| text_.clear();
|
| cursor_position_ = string16::npos;
|
| current_url_ = GURL();
|
| - current_page_classification_ = AutocompleteInput::INVALID_SPEC;
|
| + omnibox_context_ = AutocompleteInput::INVALID_SPEC;
|
| type_ = INVALID;
|
| parts_ = url_parse::Parsed();
|
| scheme_.clear();
|
|
|