| 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_provider.h" | 5 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/autocomplete/autocomplete_match.h" | 9 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 10 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 Type type) | 27 Type type) |
| 28 : profile_(profile), | 28 : profile_(profile), |
| 29 listener_(listener), | 29 listener_(listener), |
| 30 done_(true), | 30 done_(true), |
| 31 type_(type) { | 31 type_(type) { |
| 32 } | 32 } |
| 33 | 33 |
| 34 // static | 34 // static |
| 35 const char* AutocompleteProvider::TypeToString(Type type) { | 35 const char* AutocompleteProvider::TypeToString(Type type) { |
| 36 switch (type) { | 36 switch (type) { |
| 37 case TYPE_BOOKMARK: |
| 38 return "Bookmark"; |
| 37 case TYPE_BUILTIN: | 39 case TYPE_BUILTIN: |
| 38 return "Builtin"; | 40 return "Builtin"; |
| 39 case TYPE_CONTACT: | 41 case TYPE_CONTACT: |
| 40 return "Contact"; | 42 return "Contact"; |
| 41 case TYPE_EXTENSION_APP: | 43 case TYPE_EXTENSION_APP: |
| 42 return "ExtensionApp"; | 44 return "ExtensionApp"; |
| 43 case TYPE_HISTORY_CONTENTS: | 45 case TYPE_HISTORY_CONTENTS: |
| 44 return "HistoryContents"; | 46 return "HistoryContents"; |
| 45 case TYPE_HISTORY_QUICK: | 47 case TYPE_HISTORY_QUICK: |
| 46 return "HistoryQuick"; | 48 return "HistoryQuick"; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 64 done_ = true; | 66 done_ = true; |
| 65 } | 67 } |
| 66 | 68 |
| 67 const char* AutocompleteProvider::GetName() const { | 69 const char* AutocompleteProvider::GetName() const { |
| 68 return TypeToString(type_); | 70 return TypeToString(type_); |
| 69 } | 71 } |
| 70 | 72 |
| 71 metrics::OmniboxEventProto_ProviderType AutocompleteProvider:: | 73 metrics::OmniboxEventProto_ProviderType AutocompleteProvider:: |
| 72 AsOmniboxEventProviderType() const { | 74 AsOmniboxEventProviderType() const { |
| 73 switch (type_) { | 75 switch (type_) { |
| 76 case TYPE_BOOKMARK: |
| 77 return metrics::OmniboxEventProto::BOOKMARK; |
| 74 case TYPE_BUILTIN: | 78 case TYPE_BUILTIN: |
| 75 return metrics::OmniboxEventProto::BUILTIN; | 79 return metrics::OmniboxEventProto::BUILTIN; |
| 76 case TYPE_CONTACT: | 80 case TYPE_CONTACT: |
| 77 return metrics::OmniboxEventProto::CONTACT; | 81 return metrics::OmniboxEventProto::CONTACT; |
| 78 case TYPE_EXTENSION_APP: | 82 case TYPE_EXTENSION_APP: |
| 79 return metrics::OmniboxEventProto::EXTENSION_APPS; | 83 return metrics::OmniboxEventProto::EXTENSION_APPS; |
| 80 case TYPE_HISTORY_CONTENTS: | 84 case TYPE_HISTORY_CONTENTS: |
| 81 return metrics::OmniboxEventProto::HISTORY_CONTENTS; | 85 return metrics::OmniboxEventProto::HISTORY_CONTENTS; |
| 82 case TYPE_HISTORY_QUICK: | 86 case TYPE_HISTORY_QUICK: |
| 83 return metrics::OmniboxEventProto::HISTORY_QUICK; | 87 return metrics::OmniboxEventProto::HISTORY_QUICK; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 if (!profile_) | 140 if (!profile_) |
| 137 return; | 141 return; |
| 138 | 142 |
| 139 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); | 143 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); |
| 140 if (!bookmark_model || !bookmark_model->IsLoaded()) | 144 if (!bookmark_model || !bookmark_model->IsLoaded()) |
| 141 return; | 145 return; |
| 142 | 146 |
| 143 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) | 147 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) |
| 144 i->starred = bookmark_model->IsBookmarked(i->destination_url); | 148 i->starred = bookmark_model->IsBookmarked(i->destination_url); |
| 145 } | 149 } |
| OLD | NEW |