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/ui/search_engines/search_engine_tab_helper.h" | 5 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/search_engines/template_url.h" | 8 #include "chrome/browser/search_engines/template_url.h" |
9 #include "chrome/browser/search_engines/template_url_fetcher.h" | 9 #include "chrome/browser/search_engines/template_url_fetcher.h" |
10 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" | 10 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 if (!url.is_valid()) | 48 if (!url.is_valid()) |
49 return base::string16(); | 49 return base::string16(); |
50 } | 50 } |
51 | 51 |
52 // Don't autogenerate keywords for referrers that are anything other than HTTP | 52 // Don't autogenerate keywords for referrers that are anything other than HTTP |
53 // or have a path. | 53 // or have a path. |
54 // | 54 // |
55 // If we relax the path constraint, we need to be sure to sanitize the path | 55 // If we relax the path constraint, we need to be sure to sanitize the path |
56 // elements and update AutocompletePopup to look for keywords using the path. | 56 // elements and update AutocompletePopup to look for keywords using the path. |
57 // See http://b/issue?id=863583. | 57 // See http://b/issue?id=863583. |
58 if (!url.SchemeIs(content::kHttpScheme) || (url.path().length() > 1)) | 58 if (!url.SchemeIs(url::kHttpScheme) || (url.path().length() > 1)) |
59 return base::string16(); | 59 return base::string16(); |
60 | 60 |
61 return TemplateURLService::GenerateKeyword(url); | 61 return TemplateURLService::GenerateKeyword(url); |
62 } | 62 } |
63 | 63 |
64 } // namespace | 64 } // namespace |
65 | 65 |
66 SearchEngineTabHelper::~SearchEngineTabHelper() { | 66 SearchEngineTabHelper::~SearchEngineTabHelper() { |
67 } | 67 } |
68 | 68 |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 // the favicon url wasn't obtained before the load started. This assumes the | 196 // the favicon url wasn't obtained before the load started. This assumes the |
197 // latter. | 197 // latter. |
198 // TODO(sky): Need a way to set the favicon that doesn't involve generating | 198 // TODO(sky): Need a way to set the favicon that doesn't involve generating |
199 // its url. | 199 // its url. |
200 data.favicon_url = current_favicon.is_valid() ? | 200 data.favicon_url = current_favicon.is_valid() ? |
201 current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url); | 201 current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url); |
202 data.safe_for_autoreplace = true; | 202 data.safe_for_autoreplace = true; |
203 data.input_encodings.push_back(params.searchable_form_encoding); | 203 data.input_encodings.push_back(params.searchable_form_encoding); |
204 url_service->Add(new TemplateURL(profile, data)); | 204 url_service->Add(new TemplateURL(profile, data)); |
205 } | 205 } |
OLD | NEW |