| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" | 5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 result->destination_url = input.destination_url.spec(); | 68 result->destination_url = input.destination_url.spec(); |
| 69 result->contents = mojo::String::From(input.contents); | 69 result->contents = mojo::String::From(input.contents); |
| 70 // At this time, we're not bothering to send along the long vector that | 70 // At this time, we're not bothering to send along the long vector that |
| 71 // represent contents classification. i.e., for each character, what | 71 // represent contents classification. i.e., for each character, what |
| 72 // type of text it is. | 72 // type of text it is. |
| 73 result->description = mojo::String::From(input.description); | 73 result->description = mojo::String::From(input.description); |
| 74 // At this time, we're not bothering to send along the long vector that | 74 // At this time, we're not bothering to send along the long vector that |
| 75 // represents description classification. i.e., for each character, what | 75 // represents description classification. i.e., for each character, what |
| 76 // type of text it is. | 76 // type of text it is. |
| 77 result->transition = input.transition; | 77 result->transition = input.transition; |
| 78 result->is_history_what_you_typed_match = | |
| 79 input.is_history_what_you_typed_match; | |
| 80 result->allowed_to_be_default_match = input.allowed_to_be_default_match; | 78 result->allowed_to_be_default_match = input.allowed_to_be_default_match; |
| 81 result->type = AutocompleteMatchType::ToString(input.type); | 79 result->type = AutocompleteMatchType::ToString(input.type); |
| 82 if (input.associated_keyword.get() != NULL) { | 80 if (input.associated_keyword.get() != NULL) { |
| 83 result->associated_keyword = | 81 result->associated_keyword = |
| 84 mojo::String::From(input.associated_keyword->keyword); | 82 mojo::String::From(input.associated_keyword->keyword); |
| 85 } | 83 } |
| 86 result->keyword = mojo::String::From(input.keyword); | 84 result->keyword = mojo::String::From(input.keyword); |
| 87 result->duplicates = static_cast<int32>(input.duplicate_matches.size()); | 85 result->duplicates = static_cast<int32>(input.duplicate_matches.size()); |
| 88 result->from_previous = input.from_previous; | 86 result->from_previous = input.from_previous; |
| 89 | 87 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 ChromeAutocompleteSchemeClassifier(profile_)); | 197 ChromeAutocompleteSchemeClassifier(profile_)); |
| 200 controller_->Start(input_); | 198 controller_->Start(input_); |
| 201 } | 199 } |
| 202 | 200 |
| 203 void OmniboxUIHandler::ResetController() { | 201 void OmniboxUIHandler::ResetController() { |
| 204 controller_.reset(new AutocompleteController(profile_, | 202 controller_.reset(new AutocompleteController(profile_, |
| 205 TemplateURLServiceFactory::GetForProfile(profile_), | 203 TemplateURLServiceFactory::GetForProfile(profile_), |
| 206 this, | 204 this, |
| 207 AutocompleteClassifier::kDefaultOmniboxProviders)); | 205 AutocompleteClassifier::kDefaultOmniboxProviders)); |
| 208 } | 206 } |
| OLD | NEW |