| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 result->transition = input.transition; | 75 result->transition = input.transition; |
| 76 result->is_history_what_you_typed_match = | 76 result->is_history_what_you_typed_match = |
| 77 input.is_history_what_you_typed_match; | 77 input.is_history_what_you_typed_match; |
| 78 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; |
| 79 result->type = AutocompleteMatchType::ToString(input.type); | 79 result->type = AutocompleteMatchType::ToString(input.type); |
| 80 if (input.associated_keyword.get() != NULL) { | 80 if (input.associated_keyword.get() != NULL) { |
| 81 result->associated_keyword = | 81 result->associated_keyword = |
| 82 mojo::String::From(input.associated_keyword->keyword); | 82 mojo::String::From(input.associated_keyword->keyword); |
| 83 } | 83 } |
| 84 result->keyword = mojo::String::From(input.keyword); | 84 result->keyword = mojo::String::From(input.keyword); |
| 85 result->starred = input.starred; | |
| 86 result->duplicates = static_cast<int32>(input.duplicate_matches.size()); | 85 result->duplicates = static_cast<int32>(input.duplicate_matches.size()); |
| 87 result->from_previous = input.from_previous; | 86 result->from_previous = input.from_previous; |
| 88 | 87 |
| 89 result->additional_info = | 88 result->additional_info = |
| 90 mojo::Array<AutocompleteAdditionalInfoPtr>::From(input.additional_info); | 89 mojo::Array<AutocompleteAdditionalInfoPtr>::From(input.additional_info); |
| 91 return result.Pass(); | 90 return result.Pass(); |
| 92 } | 91 } |
| 93 }; | 92 }; |
| 94 | 93 |
| 95 template <> | 94 template <> |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 ChromeAutocompleteSchemeClassifier(profile_)); | 178 ChromeAutocompleteSchemeClassifier(profile_)); |
| 180 controller_->Start(input_); | 179 controller_->Start(input_); |
| 181 } | 180 } |
| 182 | 181 |
| 183 void OmniboxUIHandler::ResetController() { | 182 void OmniboxUIHandler::ResetController() { |
| 184 controller_.reset(new AutocompleteController(profile_, | 183 controller_.reset(new AutocompleteController(profile_, |
| 185 TemplateURLServiceFactory::GetForProfile(profile_), | 184 TemplateURLServiceFactory::GetForProfile(profile_), |
| 186 this, | 185 this, |
| 187 AutocompleteClassifier::kDefaultOmniboxProviders)); | 186 AutocompleteClassifier::kDefaultOmniboxProviders)); |
| 188 } | 187 } |
| OLD | NEW |