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

Side by Side Diff: chrome/browser/ui/search_engines/search_engine_tab_helper.cc

Issue 338363004: Remove Profile* from TemplateURL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 controller.GetLastCommittedEntry()->GetFavicon().url; 194 controller.GetLastCommittedEntry()->GetFavicon().url;
195 // If the favicon url isn't valid, it means there really isn't a favicon, or 195 // If the favicon url isn't valid, it means there really isn't a favicon, or
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(data));
205 } 205 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698