| 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 "components/omnibox/browser/autocomplete_classifier.h" | 5 #include "components/omnibox/browser/autocomplete_classifier.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" | 
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 22     AutocompleteProvider::TYPE_KEYWORD | | 22     AutocompleteProvider::TYPE_KEYWORD | | 
| 23 #endif | 23 #endif | 
| 24 #if !defined(OS_IOS) | 24 #if !defined(OS_IOS) | 
| 25     // "Builtin", "Shortcuts" and "Zero Suggest" are not supported on iOS. | 25     // "Builtin", "Shortcuts" and "Zero Suggest" are not supported on iOS. | 
| 26     AutocompleteProvider::TYPE_BUILTIN | | 26     AutocompleteProvider::TYPE_BUILTIN | | 
| 27     AutocompleteProvider::TYPE_SHORTCUTS | | 27     AutocompleteProvider::TYPE_SHORTCUTS | | 
| 28     AutocompleteProvider::TYPE_ZERO_SUGGEST | | 28     AutocompleteProvider::TYPE_ZERO_SUGGEST | | 
| 29 #else | 29 #else | 
| 30     // "URL from clipboard" can only be used on iOS. | 30     // "URL from clipboard" can only be used on iOS. | 
| 31     AutocompleteProvider::TYPE_CLIPBOARD_URL | | 31     AutocompleteProvider::TYPE_CLIPBOARD_URL | | 
|  | 32     // Physical Web omnibox results are only implemented on iOS. | 
|  | 33     AutocompleteProvider::TYPE_PHYSICAL_WEB | | 
| 32 #endif | 34 #endif | 
| 33     AutocompleteProvider::TYPE_BOOKMARK | | 35     AutocompleteProvider::TYPE_BOOKMARK | | 
| 34     AutocompleteProvider::TYPE_HISTORY_QUICK | | 36     AutocompleteProvider::TYPE_HISTORY_QUICK | | 
| 35     AutocompleteProvider::TYPE_HISTORY_URL | | 37     AutocompleteProvider::TYPE_HISTORY_URL | | 
| 36     AutocompleteProvider::TYPE_SEARCH; | 38     AutocompleteProvider::TYPE_SEARCH; | 
| 37 | 39 | 
| 38 AutocompleteClassifier::AutocompleteClassifier( | 40 AutocompleteClassifier::AutocompleteClassifier( | 
| 39     std::unique_ptr<AutocompleteController> controller, | 41     std::unique_ptr<AutocompleteController> controller, | 
| 40     std::unique_ptr<AutocompleteSchemeClassifier> scheme_classifier) | 42     std::unique_ptr<AutocompleteSchemeClassifier> scheme_classifier) | 
| 41     : controller_(std::move(controller)), | 43     : controller_(std::move(controller)), | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 70     if (alternate_nav_url) | 72     if (alternate_nav_url) | 
| 71       *alternate_nav_url = GURL(); | 73       *alternate_nav_url = GURL(); | 
| 72     return; | 74     return; | 
| 73   } | 75   } | 
| 74 | 76 | 
| 75   DCHECK(result.default_match() != result.end()); | 77   DCHECK(result.default_match() != result.end()); | 
| 76   *match = *result.default_match(); | 78   *match = *result.default_match(); | 
| 77   if (alternate_nav_url) | 79   if (alternate_nav_url) | 
| 78     *alternate_nav_url = result.alternate_nav_url(); | 80     *alternate_nav_url = result.alternate_nav_url(); | 
| 79 } | 81 } | 
| OLD | NEW | 
|---|