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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/string16.h" 12 #include "base/string16.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/search_engines/template_url.h" 16 #include "chrome/browser/search_engines/template_url.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #undef IN // On Windows, windef.h defines this, which screws up "India" cases. 22 #undef IN // On Windows, windef.h defines this, which screws up "India" cases.
23 #elif defined(OS_MACOSX) 23 #elif defined(OS_MACOSX)
24 #include "base/scoped_cftyperef.h" 24 #include "base/scoped_cftyperef.h"
25 #endif 25 #endif
(...skipping 3233 matching lines...) Expand 10 before | Expand all | Expand 10 after
3259 engines[i]->suggest_url, 3259 engines[i]->suggest_url,
3260 engines[i]->encoding, 3260 engines[i]->encoding,
3261 engines[i]->search_engine_type, 3261 engines[i]->search_engine_type,
3262 engines[i]->logo_id, 3262 engines[i]->logo_id,
3263 engines[i]->id); 3263 engines[i]->id);
3264 t_urls->push_back(turl); 3264 t_urls->push_back(turl);
3265 } 3265 }
3266 } 3266 }
3267 3267
3268 } // namespace TemplateURLPrepopulateData 3268 } // namespace TemplateURLPrepopulateData
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698