| 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/autocomplete/autocomplete_classifier.h" | 5 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 8 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
| 9 #include "chrome/browser/autocomplete/autocomplete_input.h" | 9 #include "chrome/browser/autocomplete/autocomplete_input.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete_match.h" | 10 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 11 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 11 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
| 12 #include "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
| 13 | 13 |
| 14 // static | 14 // static |
| 15 const int AutocompleteClassifier::kDefaultOmniboxProviders = | 15 const int AutocompleteClassifier::kDefaultOmniboxProviders = |
| 16 AutocompleteProvider::TYPE_BOOKMARK | |
| 16 AutocompleteProvider::TYPE_BUILTIN | | 17 AutocompleteProvider::TYPE_BUILTIN | |
| 17 AutocompleteProvider::TYPE_EXTENSION_APP | | 18 AutocompleteProvider::TYPE_EXTENSION_APP | |
| 18 AutocompleteProvider::TYPE_HISTORY_CONTENTS | | 19 AutocompleteProvider::TYPE_HISTORY_CONTENTS | |
| 19 AutocompleteProvider::TYPE_HISTORY_QUICK | | 20 AutocompleteProvider::TYPE_HISTORY_QUICK | |
| 20 AutocompleteProvider::TYPE_HISTORY_URL | | 21 AutocompleteProvider::TYPE_HISTORY_URL | |
| 21 AutocompleteProvider::TYPE_KEYWORD | | 22 AutocompleteProvider::TYPE_KEYWORD | |
| 22 AutocompleteProvider::TYPE_SEARCH | | 23 AutocompleteProvider::TYPE_SEARCH | |
| 23 AutocompleteProvider::TYPE_SHORTCUTS | | 24 AutocompleteProvider::TYPE_SHORTCUTS | |
| 24 AutocompleteProvider::TYPE_ZERO_SUGGEST; | 25 AutocompleteProvider::TYPE_ZERO_SUGGEST; |
| 25 | 26 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 | 65 |
| 65 DCHECK(result.default_match() != result.end()); | 66 DCHECK(result.default_match() != result.end()); |
| 66 *match = *result.default_match(); | 67 *match = *result.default_match(); |
| 67 if (alternate_nav_url) | 68 if (alternate_nav_url) |
| 68 *alternate_nav_url = result.alternate_nav_url(); | 69 *alternate_nav_url = result.alternate_nav_url(); |
| 69 } | 70 } |
| 70 | 71 |
| 71 void AutocompleteClassifier::Shutdown() { | 72 void AutocompleteClassifier::Shutdown() { |
| 72 controller_.reset(); | 73 controller_.reset(); |
| 73 } | 74 } |
| OLD | NEW |