| 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" |
| 11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 15 #include "content/public/common/url_constants.h" | 16 #include "content/public/common/url_constants.h" |
| 16 #include "googleurl/src/gurl.h" | 17 #include "googleurl/src/gurl.h" |
| 17 #include "googleurl/src/url_util.h" | 18 #include "googleurl/src/url_util.h" |
| 18 #include "net/base/net_util.h" | 19 #include "net/base/net_util.h" |
| 19 | 20 |
| 20 // static | 21 // static |
| 21 const size_t AutocompleteProvider::kMaxMatches = 3; | 22 const size_t AutocompleteProvider::kMaxMatches = 3; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL); | 90 return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL); |
| 90 } | 91 } |
| 91 | 92 |
| 92 void AutocompleteProvider::UpdateStarredStateOfMatches() { | 93 void AutocompleteProvider::UpdateStarredStateOfMatches() { |
| 93 if (matches_.empty()) | 94 if (matches_.empty()) |
| 94 return; | 95 return; |
| 95 | 96 |
| 96 if (!profile_) | 97 if (!profile_) |
| 97 return; | 98 return; |
| 98 | 99 |
| 99 BookmarkModel* bookmark_model = profile_->GetBookmarkModel(); | 100 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); |
| 100 if (!bookmark_model || !bookmark_model->IsLoaded()) | 101 if (!bookmark_model || !bookmark_model->IsLoaded()) |
| 101 return; | 102 return; |
| 102 | 103 |
| 103 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) | 104 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) |
| 104 i->starred = bookmark_model->IsBookmarked(i->destination_url); | 105 i->starred = bookmark_model->IsBookmarked(i->destination_url); |
| 105 } | 106 } |
| OLD | NEW |