Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: chrome/browser/autocomplete/autocomplete_provider.cc

Issue 23164011: Omnibox: Reduce Bolding Flicker in SearchProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: even fancier solution Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/autocomplete/autocomplete_match.h" 10 #include "chrome/browser/autocomplete/autocomplete_match.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 DLOG(WARNING) << "The AutocompleteProvider '" << GetName() 101 DLOG(WARNING) << "The AutocompleteProvider '" << GetName()
102 << "' has not implemented DeleteMatch."; 102 << "' has not implemented DeleteMatch.";
103 } 103 }
104 104
105 void AutocompleteProvider::AddProviderInfo(ProvidersInfo* provider_info) const { 105 void AutocompleteProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
106 } 106 }
107 107
108 void AutocompleteProvider::ResetSession() { 108 void AutocompleteProvider::ResetSession() {
109 } 109 }
110 110
111 // static
112 bool AutocompleteProvider::HasHTTPScheme(const string16& input) {
Mark P 2013/08/16 23:25:58 This is a cut and paste.
113 std::string utf8_input(UTF16ToUTF8(input));
114 url_parse::Component scheme;
115 if (url_util::FindAndCompareScheme(utf8_input, content::kViewSourceScheme,
116 &scheme))
117 utf8_input.erase(0, scheme.end() + 1);
118 return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL);
119 }
120
111 string16 AutocompleteProvider::StringForURLDisplay(const GURL& url, 121 string16 AutocompleteProvider::StringForURLDisplay(const GURL& url,
112 bool check_accept_lang, 122 bool check_accept_lang,
113 bool trim_http) const { 123 bool trim_http) const {
114 std::string languages = (check_accept_lang && profile_) ? 124 std::string languages = (check_accept_lang && profile_) ?
115 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::string(); 125 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::string();
116 return net::FormatUrl(url, languages, 126 return net::FormatUrl(url, languages,
117 net::kFormatUrlOmitAll & ~(trim_http ? 0 : net::kFormatUrlOmitHTTP), 127 net::kFormatUrlOmitAll & ~(trim_http ? 0 : net::kFormatUrlOmitHTTP),
118 net::UnescapeRule::SPACES, NULL, NULL, NULL); 128 net::UnescapeRule::SPACES, NULL, NULL, NULL);
119 } 129 }
120 130
121 AutocompleteProvider::~AutocompleteProvider() { 131 AutocompleteProvider::~AutocompleteProvider() {
122 Stop(false); 132 Stop(false);
123 } 133 }
124 134
125 // static
126 bool AutocompleteProvider::HasHTTPScheme(const string16& input) {
127 std::string utf8_input(UTF16ToUTF8(input));
128 url_parse::Component scheme;
129 if (url_util::FindAndCompareScheme(utf8_input, content::kViewSourceScheme,
130 &scheme))
131 utf8_input.erase(0, scheme.end() + 1);
132 return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL);
133 }
134
135 void AutocompleteProvider::UpdateStarredStateOfMatches() { 135 void AutocompleteProvider::UpdateStarredStateOfMatches() {
136 if (matches_.empty()) 136 if (matches_.empty())
137 return; 137 return;
138 138
139 if (!profile_) 139 if (!profile_)
140 return; 140 return;
141 141
142 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); 142 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
143 if (!bookmark_model || !bookmark_model->loaded()) 143 if (!bookmark_model || !bookmark_model->loaded())
144 return; 144 return;
145 145
146 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) 146 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
147 i->starred = bookmark_model->IsBookmarked(i->destination_url); 147 i->starred = bookmark_model->IsBookmarked(i->destination_url);
148 } 148 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698