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

Unified Diff: chrome/browser/search_engines/template_url_parser.h

Issue 14232019: Do not use a UIThreadSearchTermsData when validating a TemplateURL for which the Profile is NULL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move logic to GetTemplateURL. Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_parser.h
diff --git a/chrome/browser/search_engines/template_url_parser.h b/chrome/browser/search_engines/template_url_parser.h
index c7b327b3b05a0e2809b7d3086df92c9bb64283d3..eb76222696f109d4a37906ff8fc8ac84ac5b3df3 100644
--- a/chrome/browser/search_engines/template_url_parser.h
+++ b/chrome/browser/search_engines/template_url_parser.h
@@ -28,13 +28,15 @@ class TemplateURLParser {
};
// Decodes the chunk of data representing a TemplateURL, creates the
- // TemplateURL, and returns it. The caller owns the returned object. Returns
- // NULL if data does not describe a valid TemplateURL, the URLs referenced do
- // not point to valid http/https resources, or for some other reason we do not
- // support the described TemplateURL. |parameter_filter| can be used if you
- // want to filter some parameters out of the URL. For example, when importing
- // from another browser, we remove any parameter identifying that browser. If
- // set to NULL, the URL is not modified.
+ // TemplateURL, and returns it. The caller owns the returned object.
+ // |profile| will be used to generate the TemplateUrl returned and should
Peter Kasting 2013/04/17 22:50:06 Nit: The profile isn't used to generate the TURL,
gab 2013/04/18 15:00:27 Done.
+ // be NULL if this is called from any thread other than the UI thread.
+ // Returns NULL if data does not describe a valid TemplateURL, the URLs
+ // referenced do not point to valid http/https resources, or for some other
+ // reason we do not support the described TemplateURL. |parameter_filter| can
+ // be used if you want to filter some parameters out of the URL. For example,
+ // when importing from another browser, we remove any parameter identifying
+ // that browser. If set to NULL, the URL is not modified.
static TemplateURL* Parse(Profile* profile,
bool show_in_default_list,
const char* data,

Powered by Google App Engine
This is Rietveld 408576698