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 "base/memory/ptr_util.h" |
7 #include "base/metrics/histogram_macros.h" | 8 #include "base/metrics/histogram_macros.h" |
8 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" | 10 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" |
10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 11 #include "chrome/browser/search_engines/template_url_service_factory.h" |
11 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" | 12 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" |
12 #include "chrome/common/render_messages.h" | 13 #include "chrome/common/render_messages.h" |
13 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
14 #include "components/search_engines/template_url.h" | 15 #include "components/search_engines/template_url.h" |
15 #include "components/search_engines/template_url_fetcher.h" | 16 #include "components/search_engines/template_url_fetcher.h" |
16 #include "components/search_engines/template_url_service.h" | 17 #include "components/search_engines/template_url_service.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 controller.GetLastCommittedEntry()->GetFavicon().url; | 212 controller.GetLastCommittedEntry()->GetFavicon().url; |
212 // If the favicon url isn't valid, it means there really isn't a favicon, or | 213 // If the favicon url isn't valid, it means there really isn't a favicon, or |
213 // the favicon url wasn't obtained before the load started. This assumes the | 214 // the favicon url wasn't obtained before the load started. This assumes the |
214 // latter. | 215 // latter. |
215 // TODO(sky): Need a way to set the favicon that doesn't involve generating | 216 // TODO(sky): Need a way to set the favicon that doesn't involve generating |
216 // its url. | 217 // its url. |
217 data.favicon_url = current_favicon.is_valid() ? | 218 data.favicon_url = current_favicon.is_valid() ? |
218 current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url); | 219 current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url); |
219 data.safe_for_autoreplace = true; | 220 data.safe_for_autoreplace = true; |
220 data.input_encodings.push_back(params.searchable_form_encoding); | 221 data.input_encodings.push_back(params.searchable_form_encoding); |
221 url_service->Add(new TemplateURL(data)); | 222 url_service->Add(base::MakeUnique<TemplateURL>(data)); |
222 } | 223 } |
OLD | NEW |