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

Side by Side Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 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 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/search_engines/template_url_prepopulate_data.h" 5 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <locale.h> 8 #include <locale.h>
9 #endif 9 #endif
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "base/string_piece.h" 17 #include "base/string_piece.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "chrome/browser/google/google_util.h" 20 #include "chrome/browser/google/google_util.h"
21 #include "chrome/browser/prefs/pref_registry_syncable.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/search_engines/prepopulated_engines.h" 22 #include "chrome/browser/search_engines/prepopulated_engines.h"
24 #include "chrome/browser/search_engines/search_engine_type.h" 23 #include "chrome/browser/search_engines/search_engine_type.h"
25 #include "chrome/browser/search_engines/search_terms_data.h" 24 #include "chrome/browser/search_engines/search_terms_data.h"
26 #include "chrome/browser/search_engines/template_url.h" 25 #include "chrome/browser/search_engines/template_url.h"
27 #include "chrome/browser/search_engines/template_url_service.h" 26 #include "chrome/browser/search_engines/template_url_service.h"
28 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
29 #include "components/user_prefs/pref_registry_syncable.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "googleurl/src/gurl.h" 31 #include "googleurl/src/gurl.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 35
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
37 #undef IN // On Windows, windef.h defines this, which screws up "India" cases. 37 #undef IN // On Windows, windef.h defines this, which screws up "India" cases.
38 #elif defined(OS_MACOSX) 38 #elif defined(OS_MACOSX)
39 #include "base/mac/scoped_cftyperef.h" 39 #include "base/mac/scoped_cftyperef.h"
(...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) { 1288 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
1289 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) { 1289 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
1290 return GURL((size == LOGO_200_PERCENT) ? 1290 return GURL((size == LOGO_200_PERCENT) ?
1291 google_logos.logo_200_percent_url : 1291 google_logos.logo_200_percent_url :
1292 google_logos.logo_100_percent_url); 1292 google_logos.logo_100_percent_url);
1293 } 1293 }
1294 return GURL(); 1294 return GURL();
1295 } 1295 }
1296 1296
1297 } // namespace TemplateURLPrepopulateData 1297 } // namespace TemplateURLPrepopulateData
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698