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

Side by Side Diff: chrome/browser/protector/histograms.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, 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 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/protector/histograms.h" 5 #include "chrome/browser/protector/histograms.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.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_prepopulate_data.h" 9 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
10 10
(...skipping 27 matching lines...) Expand all
38 const char kProtectorHistogramStartupSettingsChanged[] = 38 const char kProtectorHistogramStartupSettingsChanged[] =
39 "Protector.StartupSettings.Changed"; 39 "Protector.StartupSettings.Changed";
40 const char kProtectorHistogramStartupSettingsDiscarded[] = 40 const char kProtectorHistogramStartupSettingsDiscarded[] =
41 "Protector.StartupSettings.Discarded"; 41 "Protector.StartupSettings.Discarded";
42 const char kProtectorHistogramStartupSettingsTimeout[] = 42 const char kProtectorHistogramStartupSettingsTimeout[] =
43 "Protector.StartupSettings.Timeout"; 43 "Protector.StartupSettings.Timeout";
44 44
45 const int kProtectorMaxSearchProviderID = SEARCH_ENGINE_MAX; 45 const int kProtectorMaxSearchProviderID = SEARCH_ENGINE_MAX;
46 46
47 int GetSearchProviderHistogramID(const TemplateURL* t_url) { 47 int GetSearchProviderHistogramID(const TemplateURL* t_url) {
48 return t_url ? 48 return (t_url && t_url->url()) ?
49 TemplateURLPrepopulateData::GetEngineType(t_url->url()) : 49 TemplateURLPrepopulateData::GetEngineType(t_url->url()->url()) :
50 SEARCH_ENGINE_NONE; 50 SEARCH_ENGINE_NONE;
51 } 51 }
52 52
53 } // namespace protector 53 } // namespace protector
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698