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

Unified Diff: chrome/browser/search_engines/search_host_to_urls_map.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/browser/protector/histograms.cc ('k') | chrome/browser/search_engines/template_url.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/search_host_to_urls_map.cc
===================================================================
--- chrome/browser/search_engines/search_host_to_urls_map.cc (revision 130565)
+++ chrome/browser/search_engines/search_host_to_urls_map.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -88,8 +88,9 @@
for (TemplateURLSet::const_iterator url_set_iterator = urls.begin();
url_set_iterator != urls.end(); ++url_set_iterator) {
const TemplateURL* t_url = *url_set_iterator;
- if (t_url->url_ref().HasGoogleBaseURLs() ||
- t_url->suggestions_url_ref().HasGoogleBaseURLs()) {
+ if ((t_url->url() && t_url->url()->HasGoogleBaseURLs()) ||
+ (t_url->suggestions_url() &&
+ t_url->suggestions_url()->HasGoogleBaseURLs())) {
t_urls_using_base_url.push_back(t_url);
}
}
« no previous file with comments | « chrome/browser/protector/histograms.cc ('k') | chrome/browser/search_engines/template_url.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698